diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-22 04:51:22 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-22 06:47:17 +0300 |
| commit | 7ce09ef48f5f00588030c825aba29f6fd4df83cc (patch) | |
| tree | f94d2638cd7d01a44981903405d971e68131ab82 /intern | |
| parent | 967fe75bb6af36733241c1ecad335034aa692e18 (diff) | |
Cleanup: remove unused modifier state checks from getModifierKeys
Also remove unused numpad & caplock key index storage.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWayland.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp index d01193f5784..a9d597f3bfa 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cpp +++ b/intern/ghost/intern/GHOST_SystemWayland.cpp @@ -329,10 +329,8 @@ struct GWL_Seat { */ struct { xkb_mod_index_t shift; /* #XKB_MOD_NAME_SHIFT */ - xkb_mod_index_t caps; /* #XKB_MOD_NAME_CAPS */ xkb_mod_index_t ctrl; /* #XKB_MOD_NAME_CTRL */ xkb_mod_index_t alt; /* #XKB_MOD_NAME_ALT */ - xkb_mod_index_t num; /* #XKB_MOD_NAME_NUM */ xkb_mod_index_t logo; /* #XKB_MOD_NAME_LOGO */ } xkb_keymap_mod_index; @@ -2208,10 +2206,8 @@ static void keyboard_handle_keymap(void *data, } seat->xkb_keymap_mod_index.shift = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_SHIFT); - seat->xkb_keymap_mod_index.caps = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS); seat->xkb_keymap_mod_index.ctrl = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CTRL); seat->xkb_keymap_mod_index.alt = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_ALT); - seat->xkb_keymap_mod_index.num = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM); seat->xkb_keymap_mod_index.logo = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_LOGO); keyboard_depressed_state_reset(seat); @@ -3163,9 +3159,6 @@ GHOST_TSuccess GHOST_SystemWayland::getModifierKeys(GHOST_ModifierKeys &keys) co keys.set(GHOST_kModifierKeyLeftOS, val_l); keys.set(GHOST_kModifierKeyRightOS, val_r); - val = MOD_TEST(state, seat->xkb_keymap_mod_index.num); - keys.set(GHOST_kModifierKeyNum, val); - #undef MOD_VALIDATE #undef MOD_TEST |