swc

commit 98a3a362e8daaa92a6f710a63718e81343e652be
parent be158ddc42f306964c509cb44bdf3946d1554fae
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  1 Sep 2014 13:16:34 -0700

xkb: Use default keymap settings

This way, the user can override them by setting xkbcommon environment
variables like XKB_DEFAULT_LAYOUT and XKB_DEFAULT_VARIANT.

Diffstat:
M
libswc/xkb.c
 | 
6
+-----

1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libswc/xkb.c b/libswc/xkb.c
@@ -30,10 +30,6 @@
 #include <string.h>
 #include <sys/mman.h>
 
-const struct xkb_rule_names rule_names = {
-    .layout = "us"
-};
-
 static const char keymap_file_template[] = "swc-xkb-keymap-XXXXXX";
 
 bool xkb_initialize(struct xkb * xkb)
@@ -46,7 +42,7 @@ bool xkb_initialize(struct xkb * xkb)
         goto error0;
     }
 
-    xkb->keymap.map = xkb_keymap_new_from_names(xkb->context, &rule_names, 0);
+    xkb->keymap.map = xkb_keymap_new_from_names(xkb->context, NULL, 0);
 
     if (!xkb->keymap.map)
     {