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

little cleanups thanks to Ran Benita’s review

pull/1/head
Michael Stapelberg 2014-01-18 19:20:58 +01:00
parent 0beb9a47b1
commit 7eb43aeabd
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -11,8 +11,8 @@ CFLAGS += -std=c99
CFLAGS += -pipe
CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom xkbcommon xkbcommon-x11 xkbfile)
LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xkbcommon xkbcommon-x11 xkbfile)
CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom xkbcommon xkbcommon-x11)
LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xkbcommon xkbcommon-x11)
LIBS += -lpam
LIBS += -lev
LIBS += -lm

13
i3lock.c
View File

@ -110,8 +110,7 @@ static bool load_keymap(void) {
}
}
if (xkb_keymap != NULL)
xkb_keymap_unref(xkb_keymap);
xkb_keymap_unref(xkb_keymap);
int32_t device_id = xkb_x11_get_core_keyboard_device_id(conn);
DEBUG("device = %d\n", device_id);
@ -127,15 +126,7 @@ static bool load_keymap(void) {
return false;
}
/* 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. */
//xkb_state_update_mask(new_state,
// 0, 0, new_state->components.locked_mods,
// 0, 0, new_state->components.locked_group);
if (xkb_state != NULL)
xkb_state_unref(xkb_state);
xkb_state_unref(xkb_state);
xkb_state = new_state;
return true;