From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 9 Oct 2012 12:05:49 +0000 (+0200)
Subject: accept ctrl as synonym of control (Thanks SardemFF7)
X-Git-Tag: 4.4~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=00ac2c4c9c51dc9012016fd839b9f2d8fcbad971;p=i3%2Fi3

accept ctrl as synonym of control (Thanks SardemFF7)
---

diff --git a/parser-specs/config.spec b/parser-specs/config.spec
index 6602dcae..7b9e9cdc 100644
--- a/parser-specs/config.spec
+++ b/parser-specs/config.spec
@@ -79,7 +79,7 @@ state FLOATING_MAXIMUM_SIZE_HEIGHT:
 
 # floating_modifier <modifier>
 state FLOATING_MODIFIER:
-  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control'
+  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl'
       ->
   '+'
       ->
@@ -269,7 +269,7 @@ state FONT:
 
 # bindsym/bindcode
 state BINDING:
-  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Mode_switch'
+  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
       ->
   '+'
       ->
@@ -309,7 +309,7 @@ state MODE_IGNORE_LINE:
       -> MODE
 
 state MODE_BINDING:
-  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Mode_switch'
+  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
       ->
   '+'
       ->
@@ -371,7 +371,7 @@ state BAR_MODE:
       -> call cfg_bar_mode($mode); BAR
 
 state BAR_MODIFIER:
-  modifier = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Control', 'Shift'
+  modifier = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Control', 'Ctrl', 'Shift'
       -> call cfg_bar_modifier($modifier); BAR
 
 state BAR_POSITION:
diff --git a/src/config_directives.c b/src/config_directives.c
index 7847376d..80439ca4 100644
--- a/src/config_directives.c
+++ b/src/config_directives.c
@@ -156,7 +156,8 @@ static uint32_t modifiers_from_str(const char *str) {
         result |= BIND_MOD4;
     if (strstr(str, "Mod5") != NULL)
         result |= BIND_MOD5;
-    if (strstr(str, "Control") != NULL)
+    if (strstr(str, "Control") != NULL ||
+        strstr(str, "Ctrl") != NULL)
         result |= BIND_CONTROL;
     if (strstr(str, "Shift") != NULL)
         result |= BIND_SHIFT;
@@ -469,7 +470,8 @@ CFGFUN(bar_modifier, const char *modifier) {
         current_bar.modifier = M_MOD4;
     else if (strcmp(modifier, "Mod5") == 0)
         current_bar.modifier = M_MOD5;
-    else if (strcmp(modifier, "Control") == 0)
+    else if (strcmp(modifier, "Control") == 0 ||
+             strcmp(modifier, "Ctrl") == 0)
         current_bar.modifier = M_CONTROL;
     else if (strcmp(modifier, "Shift") == 0)
         current_bar.modifier = M_SHIFT;