Fix keyboard and mouse resize in nested containers

[i3/i3] / src / config_directives.c

diff --git a/src/config_directives.c b/src/config_directives.c
index 70e5792a375a0507ada6b1a824f08fa6fdce415a..b28ad49d3d9c66e68e1b7195b2f4a884225890b2 100644 (file)
--- a/src/config_directives.c
+++ b/src/config_directives.c
@@ -14,16 +14,6 @@
 
 #include "all.h"
 
-// Macros to make the YAJL API a bit easier to use.
-#define y(x, ...) yajl_gen_ ## x (cmd_output->json_gen, ##__VA_ARGS__)
-#define ystr(str) yajl_gen_string(cmd_output->json_gen, (unsigned char*)str, strlen(str))
-#define ysuccess(success) do { \
-    y(map_open); \
-    ystr("success"); \
-    y(bool, success); \
-    y(map_close); \
-} while (0)
-
 /*******************************************************************************
  * Criteria functions.
  ******************************************************************************/
@@ -156,7 +146,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;
@@ -179,12 +170,17 @@ CFGFUN(font, const char *font) {
 // TODO: refactor with mode_binding
 CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
     Binding *new_binding = scalloc(sizeof(Binding));
+    DLOG("bindtype %s, modifiers %s, key %s, release %s\n", bindtype, modifiers, key, release);
     new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS);
     if (strcmp(bindtype, "bindsym") == 0) {
         new_binding->symbol = sstrdup(key);
     } else {
         // TODO: strtol with proper error handling
         new_binding->keycode = atoi(key);
+        if (new_binding->keycode == 0) {
+            ELOG("Could not parse \"%s\" as a keycode, ignoring this binding.\n", key);
+            return;
+        }
     }
     new_binding->mods = modifiers_from_str(modifiers);
     new_binding->command = sstrdup(command);
@@ -200,12 +196,17 @@ static struct bindings_head *current_bindings;
 
 CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
     Binding *new_binding = scalloc(sizeof(Binding));
+    DLOG("bindtype %s, modifiers %s, key %s, release %s\n", bindtype, modifiers, key, release);
     new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS);
     if (strcmp(bindtype, "bindsym") == 0) {
         new_binding->symbol = sstrdup(key);
     } else {
         // TODO: strtol with proper error handling
         new_binding->keycode = atoi(key);
+        if (new_binding->keycode == 0) {
+            ELOG("Could not parse \"%s\" as a keycode, ignoring this binding.\n", key);
+            return;
+        }
     }
     new_binding->mods = modifiers_from_str(modifiers);
     new_binding->command = sstrdup(command);
@@ -307,6 +308,8 @@ CFGFUN(new_window, const char *windowtype, const char *border, const long width)
     } else {
         config.default_floating_border = border_style;
     }
+
+    config.default_border_width = border_width;
 }
 
 CFGFUN(hide_edge_borders, const char *borders) {
@@ -379,8 +382,13 @@ CFGFUN(restart_state, const char *path) {
 }
 
 CFGFUN(popup_during_fullscreen, const char *value) {
-    config.popup_during_fullscreen =
-        (strcmp(value, "ignore") == 0 ? PDF_IGNORE : PDF_LEAVE_FULLSCREEN);
+    if (strcmp(value, "ignore") == 0) {
+        config.popup_during_fullscreen = PDF_IGNORE;
+    } else if (strcmp(value, "leave_fullscreen") == 0) {
+        config.popup_during_fullscreen = PDF_LEAVE_FULLSCREEN;
+    } else {
+        config.popup_during_fullscreen = PDF_SMART;
+    }
 }
 
 CFGFUN(color_single, const char *colorclass, const char *color) {
@@ -434,7 +442,15 @@ CFGFUN(bar_font, const char *font) {
 }
 
 CFGFUN(bar_mode, const char *mode) {
-    current_bar.mode = (strcmp(mode, "hide") == 0 ? M_HIDE : M_DOCK);
+    current_bar.mode = (strcmp(mode, "dock") == 0 ? M_DOCK : (strcmp(mode, "hide") == 0 ? M_HIDE : M_INVISIBLE));
+}
+
+CFGFUN(bar_hidden_state, const char *hidden_state) {
+    current_bar.hidden_state = (strcmp(hidden_state, "hide") == 0 ? S_HIDE : S_SHOW);
+}
+
+CFGFUN(bar_id, const char *bar_id) {
+    current_bar.id = sstrdup(bar_id);
 }
 
 CFGFUN(bar_output, const char *output) {
@@ -459,7 +475,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;
@@ -512,7 +529,10 @@ CFGFUN(bar_tray_output, const char *output) {
 CFGFUN(bar_color_single, const char *colorclass, const char *color) {
     if (strcmp(colorclass, "background") == 0)
         current_bar.colors.background = sstrdup(color);
-    else current_bar.colors.statusline = sstrdup(color);
+    else if (strcmp(colorclass, "separator") == 0)
+        current_bar.colors.separator = sstrdup(color);
+    else
+        current_bar.colors.statusline = sstrdup(color);
 }
 
 CFGFUN(bar_status_command, const char *command) {
@@ -520,21 +540,21 @@ CFGFUN(bar_status_command, const char *command) {
     current_bar.status_command = sstrdup(command);
 }
 
+CFGFUN(bar_binding_mode_indicator, const char *value) {
+    current_bar.hide_binding_mode_indicator = !eval_boolstr(value);
+}
+
 CFGFUN(bar_workspace_buttons, const char *value) {
     current_bar.hide_workspace_buttons = !eval_boolstr(value);
 }
 
 CFGFUN(bar_finish) {
     DLOG("\t new bar configuration finished, saving.\n");
-    /* Generate a unique ID for this bar */
-    current_bar.id = sstrdup("bar-XXXXXX");
-    /* This works similar to mktemp in that it replaces the last six X with
-     * random letters, but without the restriction that the given buffer
-     * has to contain a valid path name. */
-    char *x = current_bar.id + strlen("bar-");
-    while (*x != '\0') {
-        *(x++) = (rand() % 26) + 'a';
-    }
+    /* Generate a unique ID for this bar if not already configured */
+    if (!current_bar.id)
+        sasprintf(&current_bar.id, "bar-%d", config.number_barconfigs);
+
+    config.number_barconfigs++;
 
     /* If no font was explicitly set, we use the i3 font as default */
     if (!current_bar.font && font_pattern)