diff --git a/config.def.h b/config.def.h index 22d2171..29eda6e 100644 --- a/config.def.h +++ b/config.def.h @@ -109,11 +109,11 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ #define MODKEY WLR_MODIFIER_ALT -#define TAGKEYS(KEY,SKEY,TAG) \ +#define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} } + { MODKEY|WLR_MODIFIER_SHIFT, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,KEY,toggletag, {.ui = 1 << TAG} } /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -135,7 +135,7 @@ static const Key keys[] = { { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_Return, zoom, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, @@ -143,28 +143,28 @@ static const Key keys[] = { { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, - { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_less, focusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY, XKB_KEY_greater, focusmon, {.i = WLR_DIRECTION_RIGHT} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, - TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), - TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), - TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), - TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3), - TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4), - TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5), - TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6), - TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), - TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} }, + TAGKEYS( XKB_KEY_1, 0), + TAGKEYS( XKB_KEY_2, 1), + TAGKEYS( XKB_KEY_3, 2), + TAGKEYS( XKB_KEY_4, 3), + TAGKEYS( XKB_KEY_5, 4), + TAGKEYS( XKB_KEY_6, 5), + TAGKEYS( XKB_KEY_7, 6), + TAGKEYS( XKB_KEY_8, 7), + TAGKEYS( XKB_KEY_9, 8), + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_q, quit, {0} }, /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ - { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, + { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_BackSpace, quit, {0} }, /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is * do not remove them. */ -#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } +#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_F##n, chvt, {.ui = (n)} } CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), }; diff --git a/dwl.c b/dwl.c index cf3ef70..80f7a0d 100644 --- a/dwl.c +++ b/dwl.c @@ -154,9 +154,8 @@ typedef struct { struct wl_list link; struct wlr_keyboard_group *wlr_group; - int nsyms; - const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */ - uint32_t mods; /* invalid if nsyms == 0 */ + xkb_keysym_t keysym; + uint32_t mods; // invalid if keysym == XKB_KEY_NoSymbol struct wl_event_source *key_repeat_source; struct wl_listener modifiers; @@ -295,6 +294,8 @@ 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 xkb_keysym_t keymap_get_one_sym_by_level(struct xkb_keymap *keymap, + xkb_keycode_t key, xkb_layout_index_t layout, xkb_level_index_t level); static void keypress(struct wl_listener *listener, void *data); static void keypressmod(struct wl_listener *listener, void *data); static int keyrepeat(void *data); @@ -1574,20 +1575,31 @@ keybinding(uint32_t mods, xkb_keysym_t sym) return 0; } +xkb_keysym_t +keymap_get_one_sym_by_level(struct xkb_keymap *keymap, xkb_keycode_t key, + xkb_layout_index_t layout, xkb_level_index_t level) +{ + const xkb_keysym_t *syms; + int count = xkb_keymap_key_get_syms_by_level(keymap, key, layout, level, &syms); + return count > 0 ? syms[0] : XKB_KEY_NoSymbol; +} + void keypress(struct wl_listener *listener, void *data) { - int i; /* This event is raised when a key is pressed or released. */ KeyboardGroup *group = wl_container_of(listener, group, key); struct wlr_keyboard_key_event *event = data; /* Translate libinput keycode -> xkbcommon */ uint32_t keycode = event->keycode + 8; - /* Get a list of keysyms based on the keymap for this keyboard */ - const xkb_keysym_t *syms; - int nsyms = xkb_state_key_get_syms( - group->wlr_group->keyboard.xkb_state, keycode, &syms); + struct wlr_keyboard *kb = &group->wlr_group->keyboard; + xkb_layout_index_t layout = xkb_state_key_get_layout(kb->xkb_state, keycode); + // Get the keysyms for level 0 (normal) and level 1 (shifted) + // Only one keysym for each level: + // multiple keysyms per keycode don't really exist in the real world + xkb_keysym_t sym_l0 = keymap_get_one_sym_by_level(kb->keymap, keycode, layout, 0); + xkb_keysym_t sym_l1 = keymap_get_one_sym_by_level(kb->keymap, keycode, layout, 1); int handled = 0; uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard); @@ -1597,18 +1609,19 @@ 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) { - for (i = 0; i < nsyms; i++) - handled = keybinding(mods, syms[i]) || handled; + if (sym_l0 != XKB_KEY_NoSymbol) + handled = keybinding(mods, sym_l0) || handled; + if (sym_l1 != XKB_KEY_NoSymbol) + handled = keybinding(mods, sym_l1) || handled; } if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) { group->mods = mods; - group->keysyms = syms; - group->nsyms = nsyms; + group->keysym = sym_l0; // either sym_l0 or sym_l1 will work fine wl_event_source_timer_update(group->key_repeat_source, group->wlr_group->keyboard.repeat_info.delay); } else { - group->nsyms = 0; + group->keysym = XKB_KEY_NoSymbol; wl_event_source_timer_update(group->key_repeat_source, 0); } @@ -1638,15 +1651,13 @@ int keyrepeat(void *data) { KeyboardGroup *group = data; - int i; - if (!group->nsyms || group->wlr_group->keyboard.repeat_info.rate <= 0) + if (group->keysym == XKB_KEY_NoSymbol || group->wlr_group->keyboard.repeat_info.rate <= 0) return 0; wl_event_source_timer_update(group->key_repeat_source, 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->keysym); return 0; }