jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-10-26 17:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some key binding events being passed to clients

Browse Source
This commit is contained in:
Andrea Chiavazza 2025-04-15 22:53:56 +01:00
parent 41be906af3
commit c54fa34024
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client.h
View File

@ -294,11 +294,18 @@ client_is_unmanaged(Client *c)
static inline void static inline void
client_notify_enter(struct wlr_surface *s, struct wlr_keyboard *kb) client_notify_enter(struct wlr_surface *s, struct wlr_keyboard *kb)
{ {
if (kb) uint32_t filtered[WLR_KEYBOARD_KEYS_CAP];
wlr_seat_keyboard_notify_enter(seat, s, kb->keycodes, size_t size = 0;
kb->num_keycodes, &kb->modifiers); if (!kb) {
else
wlr_seat_keyboard_notify_enter(seat, s, NULL, 0, NULL); wlr_seat_keyboard_notify_enter(seat, s, NULL, 0, NULL);
return;
}
for (size_t i = 0; i < kb->num_keycodes; i++) {
uint32_t key = kb->keycodes[i];
if (!consumed[key])
filtered[size++] = key;
}
wlr_seat_keyboard_notify_enter(seat, s, filtered, size, &kb->modifiers);
} }
static inline void static inline void

17
dwl.c
View File

@ -294,7 +294,7 @@ static void gpureset(struct wl_listener *listener, void *data);
static void handlesig(int signo); static void handlesig(int signo);
static void incnmaster(const Arg *arg); static void incnmaster(const Arg *arg);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keysym_t sym); static int keybinding(uint32_t mods, xkb_keysym_t sym, uint32_t keycode);
static void keypress(struct wl_listener *listener, void *data); static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data); static void keypressmod(struct wl_listener *listener, void *data);
static int keyrepeat(void *data); static int keyrepeat(void *data);
@ -412,6 +412,7 @@ static struct wlr_output_layout *output_layout;
static struct wlr_box sgeom; static struct wlr_box sgeom;
static struct wl_list mons; static struct wl_list mons;
static Monitor *selmon; static Monitor *selmon;
static bool consumed[KEY_MAX + 1];
#ifdef XWAYLAND #ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data); static void activatex11(struct wl_listener *listener, void *data);
@ -1556,7 +1557,7 @@ inputdevice(struct wl_listener *listener, void *data)
} }
int int
keybinding(uint32_t mods, xkb_keysym_t sym) keybinding(uint32_t mods, xkb_keysym_t sym, uint32_t keycode)
{ {
/* /*
* Here we handle compositor keybindings. This is when the compositor is * Here we handle compositor keybindings. This is when the compositor is
@ -1567,6 +1568,8 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
for (k = keys; k < END(keys); k++) { for (k = keys; k < END(keys); k++) {
if (CLEANMASK(mods) == CLEANMASK(k->mod) if (CLEANMASK(mods) == CLEANMASK(k->mod)
&& sym == k->keysym && k->func) { && sym == k->keysym && k->func) {
if (keycode <= KEY_MAX)
consumed[keycode] = true;
k->func(&k->arg); k->func(&k->arg);
return 1; return 1;
} }
@ -1591,7 +1594,6 @@ keypress(struct wl_listener *listener, void *data)
int handled = 0; int handled = 0;
uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard); uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
static bool consumed[KEY_MAX + 1];
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@ -1599,7 +1601,7 @@ keypress(struct wl_listener *listener, void *data)
* attempt to process a compositor keybinding. */ * attempt to process a compositor keybinding. */
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
for (i = 0; i < nsyms; i++) for (i = 0; i < nsyms; i++)
handled = keybinding(mods, syms[i]) || handled; handled = keybinding(mods, syms[i], event->keycode) || handled;
} }
if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) { if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) {
@ -1613,10 +1615,8 @@ keypress(struct wl_listener *listener, void *data)
wl_event_source_timer_update(group->key_repeat_source, 0); wl_event_source_timer_update(group->key_repeat_source, 0);
} }
if (handled) { if (handled)
consumed[event->keycode] = true;
return; return;
}
if (consumed[event->keycode]) { if (consumed[event->keycode]) {
if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED)
@ -1654,7 +1654,8 @@ keyrepeat(void *data)
1000 / group->wlr_group->keyboard.repeat_info.rate); 1000 / group->wlr_group->keyboard.repeat_info.rate);
for (i = 0; i < group->nsyms; i++) for (i = 0; i < group->nsyms; i++)
keybinding(group->mods, group->keysyms[i]); // pass KEY_MAX + 1 so consumed[keycode] will not update
keybinding(group->mods, group->keysyms[i], KEY_MAX + 1);
return 0; return 0;
} }