From 96f23b4c6436d314ae4272f5f99c51b8e33556eb Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 15 Jun 2022 18:41:08 +0200 Subject: ime: track IME focus independently from keyboard focus Replace the seat->ime.focused boolean with a terminal instace pointer, seat->ime_focus. Set and reset this on ime::enter() and ime::leave() events, and use this instead of seat->kbd_focus on all other IME events. This fixes two issues: a) buggy compositors that sometimes sends an IME enter event without first having sent a keyboard enter event. b) seats may be IME capable while still lacking the keyboard capability. Such seats will *always* see IME enter events without a corresponding keyboard enter event. --- render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 27f21bd5..3b281a89 100644 --- a/render.c +++ b/render.c @@ -3576,7 +3576,7 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da grid_render(term); tll_foreach(term->wl->seats, it) { - if (it->item.kbd_focus == term) + if (it->item.ime_focus == term) ime_update_cursor_rect(&it->item); } @@ -4058,7 +4058,7 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data) grid_render(term); tll_foreach(term->wl->seats, it) { - if (it->item.kbd_focus == term) + if (it->item.ime_focus == term) ime_update_cursor_rect(&it->item); } -- cgit v1.3