aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-23 12:03:07 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-25 08:36:07 +0000
commite8ffb05bc7fb3b996752f345b77af4b757f69776 (patch)
tree1cf3f61f1b6f22d7a10d42cf333a550a2927469f /wayland.c
parentMerge branch 'clear-linebreak-flag-when-printing' (diff)
ime: move preedit state from terminal struct to the seat struct
This ensures different seat’s don’t step on each others IME pre-edit state. It also removes most dependencies on having a valid term pointer for many IME operations. We’re still not all the way, since we support disabling IME with a private mode, which is per terminal, not seat. Thus, we still require the seat to have keyboard focus on one of our windows. Closes #324. But note that *rendering* of multiple seat’s IME pre-edit strings is still broken.
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wayland.c b/wayland.c
index a092e054..edc9b482 100644
--- a/wayland.c
+++ b/wayland.c
@@ -189,7 +189,7 @@ seat_destroy(struct seat *seat)
if (seat->wl_seat != NULL)
wl_seat_release(seat->wl_seat);
- ime_reset(seat);
+ ime_reset_pending(seat);
free(seat->clipboard.text);
free(seat->primary.text);
free(seat->name);