From e8ffb05bc7fb3b996752f345b77af4b757f69776 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 23 Mar 2021 13:03:07 +0100 Subject: ime: move preedit state from terminal struct to the seat struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- ime.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ime.h') diff --git a/ime.h b/ime.h index ed2fe507..01438a5a 100644 --- a/ime.h +++ b/ime.h @@ -15,7 +15,8 @@ void ime_enable(struct seat *seat); void ime_disable(struct seat *seat); void ime_update_cursor_rect(struct seat *seat, struct terminal *term); +void ime_reset_pending_preedit(struct seat *seat); +void ime_reset_pending_commit(struct seat *seat); +void ime_reset_pending(struct seat *seat); void ime_reset_preedit(struct seat *seat); -void ime_reset_commit(struct seat *seat); -void ime_reset(struct seat *seat); void ime_send_cursor_rect(struct seat *seat, struct terminal *term); -- cgit v1.3