From c10399694e7f005d9015c7e46ebe6f3fa3fd7587 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 14 Mar 2020 11:54:23 +0100 Subject: input: remove Sway 1.2 keyboard/pointer workarounds Sway 1.4 is better than 1.2, in that we always have keyboard focus when we get a keyboard_key() event. That however is because it doesn't send keyboard_leave() on e.g. a TTY switch. Still, this is good enough - foot handles this and doesn't crash. We are also able to process input without having to refocus the window. And, Sway master (what will become Sway 1.5) has fixed this for real - we now get a keyboard_leave() and pointer_leave() event on a TTY switch. And the corresponding enter events when switching back. --- input.c | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 428ac178..7ca5e1ea 100644 --- a/input.c +++ b/input.c @@ -453,24 +453,6 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, struct wayland *wayl = data; struct terminal *term = wayl->kbd_focus; - /* Workaround buggy Sway 1.2 */ - if (term == NULL) { - static bool have_warned = false; - if (!have_warned) { - have_warned = true; - LOG_WARN("compositor sent keyboard_key event without first sending keyboard_enter"); - } - - if (tll_length(wayl->terms) == 1) { - /* With only one terminal we *know* which one has focus */ - term = tll_front(wayl->terms); - } else { - /* But with multiple windows we can't guess - ignore the event */ - stop_repeater(wayl, -1); - return; - } - } - assert(term != NULL); const xkb_mod_mask_t ctrl = 1 << wayl->kbd.mod_ctrl; @@ -908,23 +890,6 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer, LOG_DBG("pointer_motion: pointer=%p, x=%d, y=%d", wl_pointer, wl_fixed_to_int(surface_x), wl_fixed_to_int(surface_y)); - /* Workaround buggy Sway 1.2 */ - if (term == NULL) { - static bool have_warned = false; - if (!have_warned) { - have_warned = true; - LOG_WARN("compositor sent pointer_motion event without first sending pointer_enter"); - } - - if (tll_length(wayl->terms) == 1) { - /* With only one terminal we *know* which one has focus */ - term = tll_front(wayl->terms); - } else { - /* But with multiple windows we can't guess - ignore the event */ - return; - } - } - assert(term != NULL); int x = wl_fixed_to_int(surface_x) * term->scale; @@ -1012,23 +977,6 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer, struct wayland *wayl = data; struct terminal *term = wayl->mouse_focus; - /* Workaround buggy Sway 1.2 */ - if (term == NULL) { - static bool have_warned = false; - if (!have_warned) { - have_warned = true; - LOG_WARN("compositor sent pointer_button event without first sending pointer_enter"); - } - - if (tll_length(wayl->terms) == 1) { - /* With only one terminal we *know* which one has focus */ - term = tll_front(wayl->terms); - } else { - /* But with multiple windows we can't guess - ignore the event */ - return; - } - } - assert(term != NULL); /* Update double/triple click state */ -- cgit v1.3