summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-08-22 11:56:12 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-08-22 11:56:12 +0000
commit28d0ae8d0e15d146f021042c99b66b8c041b4267 (patch)
tree966326777435c7d531e414aa4eab76a143db1af3
parent043bbd8cb9812fa0bf3f589297bab7aa02740b40 (diff)
xkb lauout patch from jeremy! :)
SVN revision: 75543
-rw-r--r--AUTHORS1
-rw-r--r--src/bin/e_xkb.c29
2 files changed, 18 insertions, 12 deletions
diff --git a/AUTHORS b/AUTHORS
index d93288ec6..85ffc91e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,3 +35,4 @@ Thomas Gstädtner <thomas@gstaedtner.net>
35q66 <quaker66@gmail.com> 35q66 <quaker66@gmail.com>
36Tom Hacohen (TAsn) <tom@stosb.com> 36Tom Hacohen (TAsn) <tom@stosb.com>
37Maxime Villard <rustyBSD@gmx.fr> 37Maxime Villard <rustyBSD@gmx.fr>
38Jeremy Zurcher <jeremy@asynk.ch>
diff --git a/src/bin/e_xkb.c b/src/bin/e_xkb.c
index 352fbe9ec..473770359 100644
--- a/src/bin/e_xkb.c
+++ b/src/bin/e_xkb.c
@@ -48,21 +48,26 @@ e_xkb_update(int cur_group)
48 eina_strbuf_append(buf, ","); 48 eina_strbuf_append(buf, ",");
49 } 49 }
50 } 50 }
51 eina_strbuf_append(buf, "'"); 51 eina_strbuf_append(buf, "' -variant '");
52 /* use first entry in used layouts */
53 cl = e_config->xkb.used_layouts->data;
54 52
55 if ((cl->variant) 53 EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
56/* workaround xkb bug */
57 && (!(!strcmp(cl->variant, "basic"))))
58 { 54 {
59 eina_strbuf_append(buf, " -variant '"); 55 if (cl->variant)
60 eina_strbuf_append(buf, cl->variant); 56 {
61 /* workaround xkb bug where basic variants work with ',' at the 57 if (strcmp(cl->variant, "basic"))
62 * end, but dvorak (and mayby others) don't */ 58 eina_strbuf_append(buf, cl->variant);
63// if (!strcmp(cl->variant, "basic")) eina_strbuf_append(buf, ","); 59 eina_strbuf_append(buf, ",");
64 eina_strbuf_append(buf, "'"); 60 /* workaround xkb bug where basic variants work with ',' at the
61 * end, but dvorak (and mayby others) don't */
62// if (!strcmp(cl->variant, "basic")) eina_strbuf_append(buf, ",");
63 }
64 else
65 eina_strbuf_append(buf, ",");
65 } 66 }
67 eina_strbuf_append(buf, "'");
68
69 /* use first entry in used layouts */
70 cl = e_config->xkb.used_layouts->data;
66 71
67 if (cl->model) 72 if (cl->model)
68 { 73 {