commit 98a3a36

Michael Forney  ·  2014-09-01 20:16:34 +0000 UTC
parent be158dd 
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.
1 files changed,  +1, -5
M libswc/xkb.c
M libswc/xkb.c
+1, -5 
 1@@ -30,10 +30,6 @@
 2 #include <string.h>
 3 #include <sys/mman.h>
 4 
 5-const struct xkb_rule_names rule_names = {
 6-    .layout = "us"
 7-};
 8-
 9 static const char keymap_file_template[] = "swc-xkb-keymap-XXXXXX";
10 
11 bool xkb_initialize(struct xkb * xkb)
12@@ -46,7 +42,7 @@ bool xkb_initialize(struct xkb * xkb)
13         goto error0;
14     }
15 
16-    xkb->keymap.map = xkb_keymap_new_from_names(xkb->context, &rule_names, 0);
17+    xkb->keymap.map = xkb_keymap_new_from_names(xkb->context, NULL, 0);
18 
19     if (!xkb->keymap.map)
20     {