4 Commits

Author SHA1 Message Date
Andrea Chiavazza e23fec173a WIP remove the static array and rework the fix 2025-03-26 12:38:59 +00:00
Andrea Chiavazza 6cff4367ae remove print to stderr 2025-03-26 10:13:22 +00:00
Andrea Chiavazza 82e3bd95fc make the logic more rigorous 2025-03-25 11:04:33 +00:00
Andrea Chiavazza 609d89642c don't pass released-key events of handled events to the clients 2025-03-24 20:23:50 +00:00
+8 -6
View File
@@ -294,7 +294,7 @@ static void gpureset(struct wl_listener *listener, void *data);
static void handlesig(int signo);
static void incnmaster(const Arg *arg);
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, bool run_func);
static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data);
static int keyrepeat(void *data);
@@ -1556,7 +1556,7 @@ inputdevice(struct wl_listener *listener, void *data)
}
int
keybinding(uint32_t mods, xkb_keysym_t sym)
keybinding(uint32_t mods, xkb_keysym_t sym, bool run_func)
{
/*
* Here we handle compositor keybindings. This is when the compositor is
@@ -1567,7 +1567,8 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
for (k = keys; k < END(keys); k++) {
if (CLEANMASK(mods) == CLEANMASK(k->mod)
&& sym == k->keysym && k->func) {
k->func(&k->arg);
if (run_func)
k->func(&k->arg);
return 1;
}
}
@@ -1596,9 +1597,10 @@ keypress(struct wl_listener *listener, void *data)
/* On _press_ if there is no active screen locker,
* attempt to process a compositor keybinding. */
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
if (!locked) {
bool run_func = event->state == WL_KEYBOARD_KEY_STATE_PRESSED;
for (i = 0; i < nsyms; i++)
handled = keybinding(mods, syms[i]) || handled;
handled = keybinding(mods, syms[i], run_func) || handled;
}
if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) {
@@ -1646,7 +1648,7 @@ keyrepeat(void *data)
1000 / group->wlr_group->keyboard.repeat_info.rate);
for (i = 0; i < group->nsyms; i++)
keybinding(group->mods, group->keysyms[i]);
keybinding(group->mods, group->keysyms[i], true);
return 0;
}