mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

skip shift when getting the modifier mask (Thanks SardemFF7)

pull/1/head
Michael Stapelberg 2012-05-30 16:53:16 +02:00
parent dd02dff44a
commit 1da637c419
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xcb.c
View File

@ -159,7 +159,20 @@ uint32_t get_mod_mask(xcb_connection_t *conn, xcb_key_symbols_t *symbols, uint32
modmap_r = xcb_get_modifier_mapping_reply(conn, xcb_get_modifier_mapping(conn), NULL);
modmap = xcb_get_modifier_mapping_keycodes(modmap_r);
for (int i = 0; i < 8; i++)
for (int i = 0; i < 8; i++) {
/* We skip i == 0 (Shift) because Shift is always Shift. Handling it
* would make i3lock believe that Shift is the modifier for CapsLock in
* case CapsLock is activated using the shift keysym:
*
* $ xmodmap
* shift Shift_L (0x32), Shift_R (0x3e)
* lock Shift_L (0x32)
*
* The X11 documentation states that CapsLock and ShiftLock can only be
* on the lock modifier.
*/
if (i == 0)
continue;
for (int j = 0; j < modmap_r->keycodes_per_modifier; j++) {
kc = modmap[i * modmap_r->keycodes_per_modifier + j];
for (xcb_keycode_t *ktest = modeswitchcodes; *ktest; ktest++) {
@ -171,6 +184,7 @@ uint32_t get_mod_mask(xcb_connection_t *conn, xcb_key_symbols_t *symbols, uint32
return (1 << i);
}
}
}
free(modeswitchcodes);
free(modmap_r);