mirror of
https://codeberg.org/dwl/dwl.git
synced 2026-02-26 01:40:09 -05:00
keybinding: statically convert number keys from keycodes to keysyms, rm SKEYs from TAGKEYS + bindings, mv xkb_keysym_to_lower call to invocation in keypress
This commit is contained in:
parent
9b11a49cb7
commit
525d8b390b
2 changed files with 17 additions and 17 deletions
9
dwl.c
9
dwl.c
|
|
@ -1615,8 +1615,7 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
|
|||
*/
|
||||
const Key *k;
|
||||
for (k = keys; k < END(keys); k++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
&& xkb_keysym_to_lower(sym) == xkb_keysym_to_lower(k->keysym)
|
||||
if (CLEANMASK(mods) == CLEANMASK(k->mod) && sym == k->keysym
|
||||
&& k->func) {
|
||||
k->func(&k->arg);
|
||||
return 1;
|
||||
|
|
@ -1646,10 +1645,12 @@ keypress(struct wl_listener *listener, void *data)
|
|||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
/* On _press_ if there is no active screen locker,
|
||||
* attempt to process a compositor keybinding. */
|
||||
* attempt to process a compositor keybinding.
|
||||
* Number keys (10 <= keycode <= 18 for 1-9) are statically converted. */
|
||||
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
|
||||
for (i = 0; i < nsyms; i++)
|
||||
handled = keybinding(mods, syms[i]) || handled;
|
||||
handled = keybinding(mods, (10 <= keycode && keycode <= 18) ?
|
||||
keycode + 39 : xkb_keysym_to_lower(syms[i])) || handled;
|
||||
}
|
||||
|
||||
if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue