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

Bugfix: update the initial keyboard modifier state (Thanks lee, Ran) 

This should make the numpad work correctly.
pull/1/head
Michael Stapelberg 2013-09-01 10:01:38 +02:00
parent ad47d80e22
commit 2f17b73e20
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
i3lock.c
View File

@ -1,7 +1,7 @@
/*
* vim:ts=4:sw=4:expandtab
*
* © 2010-2012 Michael Stapelberg
* © 2010-2013 Michael Stapelberg
*
* See LICENSE for licensing information
*
@ -81,6 +81,9 @@ void u8_dec(char *s, int *i) {
* Ideally, xkbcommon would ship something like this itself, but as of now
* (version 0.2.0), it doesn’t.
*
* TODO: Once xcb-xkb is enabled by default and released, we should port this
* code to xcb-xkb. See also https://github.com/xkbcommon/libxkbcommon/issues/1
*
*/
static bool load_keymap(void) {
bool ret = false;
@ -127,6 +130,16 @@ static bool load_keymap(void) {
goto out;
}
/* Get the initial modifier state to be in sync with the X server.
* See https://github.com/xkbcommon/libxkbcommon/issues/1 for why we ignore
* the base and latched fields. */
XkbStateRec state_rec;
XkbGetState(display, XkbUseCoreKbd, &state_rec);
xkb_state_update_mask(new_state,
0, 0, state_rec.locked_mods,
0, 0, state_rec.locked_group);
if (xkb_state != NULL)
xkb_state_unref(xkb_state);
xkb_state = new_state;
@ -682,6 +695,11 @@ int main(int argc, char *argv[]) {
cursor = create_cursor(conn, screen, win, curs_choice);
grab_pointer_and_keyboard(conn, screen, cursor);
/* Load the keymap again to sync the current modifier state. Since we first
* loaded the keymap, there might have been changes, but starting from now,
* we should get all key presses/releases due to having grabbed the
* keyboard. */
(void)load_keymap();
if (dpms)
dpms_turn_off_screen(conn);