Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-13 14:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Clean up modifier key event handler

Browse Source 
Adapt style and naming to match the rest of the project.

(cherry picked from commit df8d7bc892)
This commit is contained in:
Camilla Löwy 2021-12-31 00:19:58 +01:00
parent c68ad09c04
commit 4bf6bd42fd
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wl_init.c
View File

@ -600,9 +600,6 @@ static void keyboardHandleModifiers(void* data,
uint32_t modsLocked, uint32_t modsLocked,
uint32_t group) uint32_t group)
{ {
xkb_mod_mask_t mask;
unsigned int modifiers = 0;
_glfw.wl.serial = serial; _glfw.wl.serial = serial;
if (!_glfw.wl.xkb.keymap) if (!_glfw.wl.xkb.keymap)
@ -616,24 +613,29 @@ static void keyboardHandleModifiers(void* data,
0, 0,
group); group);
mask = xkb_state_serialize_mods(_glfw.wl.xkb.state, const xkb_mod_mask_t mask =
xkb_state_serialize_mods(_glfw.wl.xkb.state,
XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_DEPRESSED |
XKB_STATE_LAYOUT_DEPRESSED | XKB_STATE_LAYOUT_DEPRESSED |
XKB_STATE_MODS_LATCHED | XKB_STATE_MODS_LATCHED |
XKB_STATE_LAYOUT_LATCHED); XKB_STATE_LAYOUT_LATCHED);
unsigned int mods = 0;
if (mask & _glfw.wl.xkb.controlMask) if (mask & _glfw.wl.xkb.controlMask)
modifiers |= GLFW_MOD_CONTROL; mods |= GLFW_MOD_CONTROL;
if (mask & _glfw.wl.xkb.altMask) if (mask & _glfw.wl.xkb.altMask)
modifiers |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;
if (mask & _glfw.wl.xkb.shiftMask) if (mask & _glfw.wl.xkb.shiftMask)
modifiers |= GLFW_MOD_SHIFT; mods |= GLFW_MOD_SHIFT;
if (mask & _glfw.wl.xkb.superMask) if (mask & _glfw.wl.xkb.superMask)
modifiers |= GLFW_MOD_SUPER; mods |= GLFW_MOD_SUPER;
if (mask & _glfw.wl.xkb.capsLockMask) if (mask & _glfw.wl.xkb.capsLockMask)
modifiers |= GLFW_MOD_CAPS_LOCK; mods |= GLFW_MOD_CAPS_LOCK;
if (mask & _glfw.wl.xkb.numLockMask) if (mask & _glfw.wl.xkb.numLockMask)
modifiers |= GLFW_MOD_NUM_LOCK; mods |= GLFW_MOD_NUM_LOCK;
_glfw.wl.xkb.modifiers = modifiers;
_glfw.wl.xkb.modifiers = mods;
} }
#ifdef WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION #ifdef WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION