From 7eb43aeabd7a5eb71927520c427debb45eab05f2 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 18 Jan 2014 19:20:58 +0100 Subject: [PATCH] =?UTF-8?q?little=20cleanups=20thanks=20to=20Ran=20Benita?= =?UTF-8?q?=E2=80=99s=20review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- i3lock.c | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 9443e97..26dd723 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/i3lock.c b/i3lock.c index f81ea18..4c8668d 100644 --- a/i3lock.c +++ b/i3lock.c @@ -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;