From 6bbd4a5110c148841e73efd4786ebae1c335ef80 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 9 Jul 2020 09:16:54 +0200 Subject: focus in/out: terminal checks whether it is a state change or not --- input.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 660f359e..1caf46b3 100644 --- a/input.c +++ b/input.c @@ -304,19 +304,9 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, LOG_DBG("keyboard_enter: keyboard=%p, serial=%u, surface=%p", wl_keyboard, serial, surface); - bool term_already_focused = false; - tll_foreach(seat->wayl->seats, it) { - if (it->item.kbd_focus == term) { - term_already_focused = true; - break; - } - } - + term_kbd_focus_in(term); seat->kbd_focus = term; seat->input_serial = serial; - - if (!term_already_focused) - term_kbd_focus_in(seat->kbd_focus); } static bool @@ -386,13 +376,9 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, seat->kbd.meta = false; xkb_compose_state_reset(seat->kbd.xkb_compose_state); - if (old_focused != NULL) { - /* Tell term it's unfocused *if* no other seats still have it focused */ - tll_foreach(seat->wayl->seats, it) - if (it->item.kbd_focus == old_focused) - return; + if (old_focused != NULL) term_kbd_focus_out(old_focused); - } else { + else { /* * Sway bug - under certain conditions we get a * keyboard_leave() (and keyboard_key()) without first having -- cgit v1.3