aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-06-28 18:57:48 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-06-28 18:57:48 +0000
commitd58290ea1213725ddf0f76be129fc5f680d9ccd2 (patch)
tree8b3dbe95ef30e067e8365fc537ef8e7ad3fbaa86
parentselection: wl_data_offer_set_action: use enum values instead of magic integers (diff)
input: don’t ignore keyboard enter/leave events when there’s no keymap
The compositor _usually_ sends the keymap event *before* the enter event. But not always. Not (yet) having a keymap is not a reason to ignore the enter event (now, on the other hand, getting a key press/release event without a keymap is a compositor bug). Closes #1097
-rw-r--r--CHANGELOG.md3
-rw-r--r--input.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dec74bc1..a052d744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,9 +80,12 @@
* Workaround for buggy compositors (e.g. some versions of GNOME)
allowing drag-and-drops even though foot has reported it does not
support the offered mime-types ([#1092][1092]).
+* Keyboard enter/leave events being ignored if there is no keymap
+ ([#1097][1097]).
[1055]: https://codeberg.org/dnkl/foot/issues/1055
[1092]: https://codeberg.org/dnkl/foot/issues/1092
+[1097]: https://codeberg.org/dnkl/foot/issues/1097
### Security
diff --git a/input.c b/input.c
index fca46050..d4598cf6 100644
--- a/input.c
+++ b/input.c
@@ -591,9 +591,6 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
LOG_DBG("%s: keyboard_enter: keyboard=%p, serial=%u, surface=%p",
seat->name, (void *)wl_keyboard, serial, (void *)surface);
- if (seat->kbd.xkb == NULL)
- return;
-
term_kbd_focus_in(term);
seat->kbd_focus = term;
seat->kbd.serial = serial;
@@ -653,9 +650,6 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
LOG_DBG("keyboard_leave: keyboard=%p, serial=%u, surface=%p",
(void *)wl_keyboard, serial, (void *)surface);
- if (seat->kbd.xkb == NULL)
- return;
-
xassert(
seat->kbd_focus == NULL ||
surface == NULL || /* Seen on Sway 1.2 */