aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-03 17:40:54 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-07 19:44:11 +0000
commit001c82fa547bb8c62c50bde1b17ff9c8dd3d61c8 (patch)
tree4168fa0a2f1914aa7004709faa7f9c3b650148d9
parentime: set cursor end correctly when it ends *after* the pre-edit string (diff)
ime: don’t adjust cursor’s cell-end if it’s equal to the cell-begin
-rw-r--r--ime.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/ime.c b/ime.c
index 67718517..eb4eadf4 100644
--- a/ime.c
+++ b/ime.c
@@ -278,19 +278,25 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
/* Bounded by number of screen columns */
cell_begin = min(max(cell_begin, 0), cell_count - 1);
-
- /* Ensure end comes *after* begin, and is bounded by screen */
- if (cell_end <= cell_begin)
- cell_end = cell_begin + max(wcwidth(term->ime.preedit.cells[cell_begin].wc), 1);
cell_end = min(max(cell_end, 0), cell_count);
+#if 1
+ if (cell_end < cell_begin)
+ cell_end = cell_begin;
+#else
+ if (cell_end <= cell_begin) {
+ cell_end = cell_begin + max(
+ wcwidth(term->ime.preedit.cells[cell_begin].wc), 1);
+ }
+#endif
+
LOG_DBG("pre-edit cursor: begin=%d, end=%d", cell_begin, cell_end);
assert(cell_begin >= 0);
assert(cell_begin < cell_count);
- assert(cell_end >= 1);
+ assert(cell_begin <= cell_end);
+ assert(cell_end >= 0);
assert(cell_end <= cell_count);
- assert(cell_begin < cell_end);
term->ime.preedit.cursor.hidden = false;
term->ime.preedit.cursor.start = cell_begin;