From 18b702b2495d4fb9328930eed9875731cff4cbde Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 21 May 2024 07:06:45 +0200 Subject: unicode-mode: move state from seat to term This fixes an issue where entering unicode-mode in one foot client, also enabled unicode-mode on other foot clients. Both visually (although glitchy), and in effect. The reason the state was originally in the seat objects, was to fully support multi-seat. That is, one seat/keyboard entering unicode-mode should not affect other seats/keyboards. The issue with this is that seat objects are Wayland global. Thus, in server mode, all seat objects are shared between the foot clients. There is a similarity with IME, which also keeps state in the seat. There's one big difference, however, and that is IME has Wayland native enter/leave events, that the compositor emits when windows are focused/unfocused. These events allow us to reset IME state. For our own Unicode mode, there is nothing similar. This patch moves the Unicode state from seats, to the terminal struct. This does mean that if one seat/keyboard enters Unicode mode, then *all* seats/keyboards will affect the unicode state. This potential downside is outweighed by the fact that different foot clients no longer affect each other. Closes #1717 --- render.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 804ccdc3..3a577482 100644 --- a/render.c +++ b/render.c @@ -1563,16 +1563,7 @@ static void render_overlay(struct terminal *term) { struct wayl_sub_surface *overlay = &term->window->overlay; - bool unicode_mode_active = false; - - /* Check if unicode mode is active on at least one seat focusing - * this terminal instance */ - tll_foreach(term->wl->seats, it) { - if (it->item.unicode_mode.active) { - unicode_mode_active = true; - break; - } - } + const bool unicode_mode_active = term->unicode_mode.active; const enum overlay_style style = term->is_searching ? OVERLAY_SEARCH : -- cgit v1.3