Merge branch 'master' into next

[i3/i3] / i3-config-wizard / cfgparse.y

diff --git a/i3-config-wizard/cfgparse.y b/i3-config-wizard/cfgparse.y
index f2e4a05466497a57471a51ad1e477c50773a786f..bbe119371430b0084605096dd9e0e8293fe824ab 100644 (file)
--- a/i3-config-wizard/cfgparse.y
+++ b/i3-config-wizard/cfgparse.y
@@ -14,6 +14,8 @@
 
 #include <X11/Xlib.h>
 
+#include "libi3.h"
+
 extern Display *dpy;
 
 struct context {
@@ -86,14 +88,16 @@ char *rewrite_binding(const char *bindingline) {
 static char *modifier_to_string(int modifiers) {
     //printf("should convert %d to string\n", modifiers);
     if (modifiers == (1 << 3))
-        return strdup("Mod1");
+        return strdup("$mod+");
     else if (modifiers == ((1 << 3) | (1 << 0)))
-        return strdup("Mod1+shift");
+        return strdup("$mod+Shift+");
     else if (modifiers == (1 << 9))
-        return strdup("$mod");
+        return strdup("$mod+");
     else if (modifiers == ((1 << 9) | (1 << 0)))
-        return strdup("$mod+shift");
-    else return strdup("UNKNOWN");
+        return strdup("$mod+Shift+");
+    else if (modifiers == (1 << 0))
+        return strdup("Shift+");
+    else return strdup("");
 }
 
 %}
@@ -139,7 +143,7 @@ bindcode:
         char *str = XKeysymToString(sym);
         char *modifiers = modifier_to_string($<number>3);
         // TODO: modifier to string
-        asprintf(&(context->result), "bindsym %s+%s %s\n", modifiers, str, $<string>6);
+        sasprintf(&(context->result), "bindsym %s%s %s\n", modifiers, str, $<string>6);
         free(modifiers);
     }
     ;