[WIP] Bump up version to 2.14.0

.gitignore

@@ -6,30 +6,8 @@ tags
 *~
 x86_64-pc-linux-gnu
 
-################################################################################
-# https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore
-################################################################################
-
-# http://www.gnu.org/software/automake
-
-Makefile.in
-/ar-lib
-/test-driver
-
-# http://www.gnu.org/software/autoconf
-
-/autom4te.cache
-/autoscan.log
-/autoscan-*.log
-/aclocal.m4
-/compile
-/config.h.in
-/config.guess
-/config.sub
-/configure
-/configure.scan
-/depcomp
-/install-sh
-/missing
-/stamp-h1
-aminclude_static.am
+# We recommend building in a subdirectory called build.
+# If you chose a different directory name,
+# it is up to you to arrange for it to be ignored by git,
+# e.g. by listing your directory in .git/info/exclude.
+/build

build.sh

@@ -1,27 +1,9 @@
-#!/bin/sh -x
+#!/bin/sh
 
-configureOpts=""
+rm -rf build/
+mkdir -p build && cd build/
 
-while getopts ":hd" opt; do
-  case ${opt} in
-    h ) echo "Use -d to turn on sanitizers (for debugging only)"
-      exit;;
-    d ) configureOpts="--enable-debug"
-      ;;
-    \? ) echo "Usage: $0 [-h] [-d]"
-      exit;;
-  esac
-done
+meson .. -Dprefix=/usr
+ninja
 
-configureOpts="${configureOpts} --prefix=/usr --sysconfdir=/etc"
-
-autoreconf -fiv
-
-BUILD_DIR=build/
-rm -rf $BUILD_DIR
-mkdir -vp $BUILD_DIR
-cd $BUILD_DIR || { echo "cd $BUILD_DIR"; exit 127; }
-
-../configure ${configureOpts}
-
-make
+# Once builded the executable can be found in the build directory

i3lock.c

@@ -232,9 +232,9 @@ int failed_attempts = 0;
 bool show_failed_attempts = false;
 bool retry_verification = false;
 
-static struct xkb_state *xkb_state;
+struct xkb_state *xkb_state;
 static struct xkb_context *xkb_context;
-static struct xkb_keymap *xkb_keymap;
+struct xkb_keymap *xkb_keymap;
 #if XKBCOMPOSE == 1
 static struct xkb_compose_table *xkb_compose_table;
 static struct xkb_compose_state *xkb_compose_state;
@@ -600,43 +600,6 @@ static void input_done(void) {
     if (debug_mode)
         fprintf(stderr, "Authentication failure\n");
 
-    /* Get state of Caps and Num lock modifiers, to be displayed in
-     * STATE_AUTH_WRONG state */
-    xkb_mod_index_t idx, num_mods;
-    const char *mod_name;
-
-    num_mods = xkb_keymap_num_mods(xkb_keymap);
-
-    for (idx = 0; idx < num_mods; idx++) {
-        if (!xkb_state_mod_index_is_active(xkb_state, idx, XKB_STATE_MODS_EFFECTIVE))
-            continue;
-
-        mod_name = xkb_keymap_mod_get_name(xkb_keymap, idx);
-        if (mod_name == NULL)
-            continue;
-
-        /* Replace certain xkb names with nicer, human-readable ones. */
-        if (strcmp(mod_name, XKB_MOD_NAME_CAPS) == 0)
-            mod_name = "Caps Lock";
-        else if (strcmp(mod_name, XKB_MOD_NAME_ALT) == 0)
-            mod_name = "Alt";
-        else if (strcmp(mod_name, XKB_MOD_NAME_NUM) == 0)
-            mod_name = "Num Lock";
-        else if (strcmp(mod_name, XKB_MOD_NAME_LOGO) == 0)
-            mod_name = "Super";
-
-        if (show_modkey_text) {
-            char *tmp;
-            if (modifier_string == NULL) {
-                if (asprintf(&tmp, "%s", mod_name) != -1)
-                    modifier_string = tmp;
-            } else if (asprintf(&tmp, "%s, %s", modifier_string, mod_name) != -1) {
-                free(modifier_string);
-                modifier_string = tmp;
-            }
-        }
-    }
-
     auth_state = STATE_AUTH_WRONG;
     failed_attempts += 1;
     clear_input();