]> git.sur5r.net Git - i3/i3/blobdiff - src/config_directives.c
Added missing newlines in log statements.
[i3/i3] / src / config_directives.c
index 36b687c40ca9d93b71a1791238b02c36be10dcf4..3db33d2e9d8942e8cd3a56552d0eddcb533c3957 100644 (file)
@@ -4,7 +4,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_directives.c: all config storing functions (see config_parser.c)
  *
@@ -68,8 +68,8 @@ CFGFUN(criteria_add, const char *ctype, const char *cvalue) {
             (end && *end != '\0')) {
             ELOG("Could not parse con id \"%s\"\n", cvalue);
         } else {
-            current_match->con_id = (Con*)parsed;
-            printf("id as int = %p\n", current_match->con_id);
+            current_match->con_id = (Con *)parsed;
+            DLOG("id as int = %p\n", current_match->con_id);
         }
         return;
     }
@@ -84,11 +84,36 @@ CFGFUN(criteria_add, const char *ctype, const char *cvalue) {
             ELOG("Could not parse window id \"%s\"\n", cvalue);
         } else {
             current_match->id = parsed;
-            printf("window id as int = %d\n", current_match->id);
+            DLOG("window id as int = %d\n", current_match->id);
         }
         return;
     }
 
+    if (strcmp(ctype, "window_type") == 0) {
+        if (strcasecmp(cvalue, "normal") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_NORMAL;
+        else if (strcasecmp(cvalue, "dialog") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_DIALOG;
+        else if (strcasecmp(cvalue, "utility") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_UTILITY;
+        else if (strcasecmp(cvalue, "toolbar") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_TOOLBAR;
+        else if (strcasecmp(cvalue, "splash") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_SPLASH;
+        else if (strcasecmp(cvalue, "menu") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_MENU;
+        else if (strcasecmp(cvalue, "dropdown_menu") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_DROPDOWN_MENU;
+        else if (strcasecmp(cvalue, "popup_menu") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_POPUP_MENU;
+        else if (strcasecmp(cvalue, "tooltip") == 0)
+            current_match->window_type = A__NET_WM_WINDOW_TYPE_TOOLTIP;
+        else
+            ELOG("unknown window_type value \"%s\"\n", cvalue);
+
+        return;
+    }
+
     if (strcmp(ctype, "con_mark") == 0) {
         current_match->mark = regex_new(cvalue);
         return;
@@ -163,27 +188,26 @@ uint32_t modifiers_from_str(const char *str) {
 static char *font_pattern;
 
 CFGFUN(font, const char *font) {
-       config.font = load_font(font, true);
-       set_font(&config.font);
+    config.font = load_font(font, true);
+    set_font(&config.font);
 
-       /* Save the font pattern for using it as bar font later on */
-       FREE(font_pattern);
-       font_pattern = sstrdup(font);
+    /* Save the font pattern for using it as bar font later on */
+    FREE(font_pattern);
+    font_pattern = sstrdup(font);
 }
 
-CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
-    configure_binding(bindtype, modifiers, key, release, command, DEFAULT_BINDING_MODE);
+CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) {
+    configure_binding(bindtype, modifiers, key, release, border, whole_window, command, DEFAULT_BINDING_MODE);
 }
 
-
 /*******************************************************************************
  * Mode handling
  ******************************************************************************/
 
 static char *current_mode;
 
-CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
-    configure_binding(bindtype, modifiers, key, release, command, current_mode);
+CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) {
+    configure_binding(bindtype, modifiers, key, release, border, whole_window, command, current_mode);
 }
 
 CFGFUN(enter_mode, const char *modename) {
@@ -197,14 +221,14 @@ CFGFUN(enter_mode, const char *modename) {
 }
 
 CFGFUN(exec, const char *exectype, const char *no_startup_id, const char *command) {
-       struct Autostart *new = smalloc(sizeof(struct Autostart));
-       new->command = sstrdup(command);
-       new->no_startup_id = (no_startup_id != NULL);
-       if (strcmp(exectype, "exec") == 0) {
-               TAILQ_INSERT_TAIL(&autostarts, new, autostarts);
-       } else {
-               TAILQ_INSERT_TAIL(&autostarts_always, new, autostarts_always);
-       }
+    struct Autostart *new = smalloc(sizeof(struct Autostart));
+    new->command = sstrdup(command);
+    new->no_startup_id = (no_startup_id != NULL);
+    if (strcmp(exectype, "exec") == 0) {
+        TAILQ_INSERT_TAIL(&autostarts, new, autostarts);
+    } else {
+        TAILQ_INSERT_TAIL(&autostarts_always, new, autostarts_always);
+    }
 }
 
 CFGFUN(for_window, const char *command) {
@@ -239,7 +263,8 @@ CFGFUN(default_orientation, const char *orientation) {
         config.default_orientation = HORIZ;
     else if (strcmp(orientation, "vertical") == 0)
         config.default_orientation = VERT;
-    else config.default_orientation = NO_ORIENTATION;
+    else
+        config.default_orientation = NO_ORIENTATION;
 }
 
 CFGFUN(workspace_layout, const char *layout) {
@@ -248,7 +273,8 @@ CFGFUN(workspace_layout, const char *layout) {
     else if (strcmp(layout, "stacking") == 0 ||
              strcmp(layout, "stacked") == 0)
         config.default_layout = L_STACKED;
-    else config.default_layout = L_TABBED;
+    else
+        config.default_layout = L_TABBED;
 }
 
 CFGFUN(new_window, const char *windowtype, const char *border, const long width) {
@@ -270,13 +296,15 @@ CFGFUN(new_window, const char *windowtype, const char *border, const long width)
     }
 
     if (strcmp(windowtype, "new_window") == 0) {
-        DLOG("default tiled border style = %d and border width = %d\n", border_style, border_width);
+        DLOG("default tiled border style = %d and border width = %d (%d physical px)\n",
+             border_style, border_width, logical_px(border_width));
         config.default_border = border_style;
-        config.default_border_width = border_width;
+        config.default_border_width = logical_px(border_width);
     } else {
-        DLOG("default floating border style = %d and border width = %d\n", border_style, border_width);
+        DLOG("default floating border style = %d and border width = %d (%d physical px)\n",
+             border_style, border_width, logical_px(border_width));
         config.default_floating_border = border_style;
-        config.default_floating_border_width = border_width;
+        config.default_floating_border_width = logical_px(border_width);
     }
 }
 
@@ -291,13 +319,21 @@ CFGFUN(hide_edge_borders, const char *borders) {
         config.hide_edge_borders = ADJ_NONE;
     else if (eval_boolstr(borders))
         config.hide_edge_borders = ADJ_LEFT_SCREEN_EDGE | ADJ_RIGHT_SCREEN_EDGE;
-    else config.hide_edge_borders = ADJ_NONE;
+    else
+        config.hide_edge_borders = ADJ_NONE;
 }
 
 CFGFUN(focus_follows_mouse, const char *value) {
     config.disable_focus_follows_mouse = !eval_boolstr(value);
 }
 
+CFGFUN(mouse_warping, const char *value) {
+    if (strcmp(value, "none") == 0)
+        config.mouse_warping = POINTER_WARPING_NONE;
+    else if (strcmp(value, "output") == 0)
+        config.mouse_warping = POINTER_WARPING_OUTPUT;
+}
+
 CFGFUN(force_xinerama, const char *value) {
     config.force_xinerama = eval_boolstr(value);
 }
@@ -318,6 +354,31 @@ CFGFUN(force_display_urgency_hint, const long duration_ms) {
     config.workspace_urgency_timer = duration_ms / 1000.0;
 }
 
+CFGFUN(delay_exit_on_zero_displays, const long duration_ms) {
+    config.zero_disp_exit_timer_ms = duration_ms;
+}
+
+CFGFUN(focus_on_window_activation, const char *mode) {
+    if (strcmp(mode, "smart") == 0)
+        config.focus_on_window_activation = FOWA_SMART;
+    else if (strcmp(mode, "urgent") == 0)
+        config.focus_on_window_activation = FOWA_URGENT;
+    else if (strcmp(mode, "focus") == 0)
+        config.focus_on_window_activation = FOWA_FOCUS;
+    else if (strcmp(mode, "none") == 0)
+        config.focus_on_window_activation = FOWA_NONE;
+    else {
+        ELOG("Unknown focus_on_window_activation mode \"%s\", ignoring it.\n", mode);
+        return;
+    }
+
+    DLOG("Set new focus_on_window_activation mode = %i.\n", config.focus_on_window_activation);
+}
+
+CFGFUN(show_marks, const char *value) {
+    config.show_marks = eval_boolstr(value);
+}
+
 CFGFUN(workspace, const char *workspace, const char *output) {
     DLOG("Assigning workspace \"%s\" to output \"%s\"\n", workspace, output);
     /* Check for earlier assignments of the same workspace so that we
@@ -365,22 +426,23 @@ CFGFUN(color_single, const char *colorclass, const char *color) {
 }
 
 CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator) {
-#define APPLY_COLORS(classname) \
-    do { \
-        if (strcmp(colorclass, "client." #classname) == 0) { \
-            config.client.classname.border = get_colorpixel(border); \
-            config.client.classname.background = get_colorpixel(background); \
-            config.client.classname.text = get_colorpixel(text); \
-            if (indicator != NULL) { \
-                config.client. classname .indicator = get_colorpixel(indicator); \
-            } \
-        } \
+#define APPLY_COLORS(classname)                                                \
+    do {                                                                       \
+        if (strcmp(colorclass, "client." #classname) == 0) {                   \
+            config.client.classname.border = get_colorpixel(border);           \
+            config.client.classname.background = get_colorpixel(background);   \
+            config.client.classname.text = get_colorpixel(text);               \
+            if (indicator != NULL) {                                           \
+                config.client.classname.indicator = get_colorpixel(indicator); \
+            }                                                                  \
+        }                                                                      \
     } while (0)
 
     APPLY_COLORS(focused_inactive);
     APPLY_COLORS(focused);
     APPLY_COLORS(unfocused);
     APPLY_COLORS(urgent);
+    APPLY_COLORS(placeholder);
 
 #undef APPLY_COLORS
 }
@@ -390,7 +452,7 @@ CFGFUN(assign, const char *workspace) {
         ELOG("Match is empty, ignoring this assignment\n");
         return;
     }
-    DLOG("new assignment, using above criteria, to workspace %s\n", workspace);
+    DLOG("New assignment, using above criteria, to workspace \"%s\".\n", workspace);
     Assignment *assignment = scalloc(sizeof(Assignment));
     match_copy(&(assignment->match), current_match);
     assignment->type = A_TO_WORKSPACE;
@@ -398,6 +460,19 @@ CFGFUN(assign, const char *workspace) {
     TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
 }
 
+CFGFUN(no_focus) {
+    if (match_is_empty(current_match)) {
+        ELOG("Match is empty, ignoring this assignment\n");
+        return;
+    }
+
+    DLOG("New assignment, using above criteria, to ignore focus on manage.\n");
+    Assignment *assignment = scalloc(sizeof(Assignment));
+    match_copy(&(assignment->match), current_match);
+    assignment->type = A_NO_FOCUS;
+    TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
+}
+
 /*******************************************************************************
  * Bar configuration (i3bar)
  ******************************************************************************/
@@ -409,6 +484,11 @@ CFGFUN(bar_font, const char *font) {
     current_bar.font = sstrdup(font);
 }
 
+CFGFUN(bar_separator_symbol, const char *separator) {
+    FREE(current_bar.separator_symbol);
+    current_bar.separator_symbol = sstrdup(separator);
+}
+
 CFGFUN(bar_mode, const char *mode) {
     current_bar.mode = (strcmp(mode, "dock") == 0 ? M_DOCK : (strcmp(mode, "hide") == 0 ? M_HIDE : M_INVISIBLE));
 }
@@ -423,7 +503,7 @@ CFGFUN(bar_id, const char *bar_id) {
 
 CFGFUN(bar_output, const char *output) {
     int new_outputs = current_bar.num_outputs + 1;
-    current_bar.outputs = srealloc(current_bar.outputs, sizeof(char*) * new_outputs);
+    current_bar.outputs = srealloc(current_bar.outputs, sizeof(char *) * new_outputs);
     current_bar.outputs[current_bar.num_outputs] = sstrdup(output);
     current_bar.num_outputs = new_outputs;
 }
@@ -450,6 +530,46 @@ CFGFUN(bar_modifier, const char *modifier) {
         current_bar.modifier = M_SHIFT;
 }
 
+static void bar_configure_binding(const char *button, const char *command) {
+    if (strncasecmp(button, "button", strlen("button")) != 0) {
+        ELOG("Bindings for a bar can only be mouse bindings, not \"%s\", ignoring.\n", button);
+        return;
+    }
+
+    int input_code = atoi(button + strlen("button"));
+    if (input_code < 1) {
+        ELOG("Button \"%s\" does not seem to be in format 'buttonX'.\n", button);
+        return;
+    }
+
+    struct Barbinding *current;
+    TAILQ_FOREACH(current, &(current_bar.bar_bindings), bindings) {
+        if (current->input_code == input_code) {
+            ELOG("command for button %s was already specified, ignoring.\n", button);
+            return;
+        }
+    }
+
+    struct Barbinding *new_binding = scalloc(sizeof(struct Barbinding));
+    new_binding->input_code = input_code;
+    new_binding->command = sstrdup(command);
+    TAILQ_INSERT_TAIL(&(current_bar.bar_bindings), new_binding, bindings);
+}
+
+CFGFUN(bar_wheel_up_cmd, const char *command) {
+    ELOG("'wheel_up_cmd' is deprecated. Please us 'bindsym button4 %s' instead.\n", command);
+    bar_configure_binding("button4", command);
+}
+
+CFGFUN(bar_wheel_down_cmd, const char *command) {
+    ELOG("'wheel_down_cmd' is deprecated. Please us 'bindsym button5 %s' instead.\n", command);
+    bar_configure_binding("button5", command);
+}
+
+CFGFUN(bar_bindsym, const char *button, const char *command) {
+    bar_configure_binding(button, command);
+}
+
 CFGFUN(bar_position, const char *position) {
     current_bar.position = (strcmp(position, "top") == 0 ? P_TOP : P_BOTTOM);
 }
@@ -460,26 +580,27 @@ CFGFUN(bar_i3bar_command, const char *i3bar_command) {
 }
 
 CFGFUN(bar_color, const char *colorclass, const char *border, const char *background, const char *text) {
-#define APPLY_COLORS(classname) \
-    do { \
-        if (strcmp(colorclass, #classname) == 0) { \
-            if (text != NULL) { \
-                /* New syntax: border, background, text */ \
-                current_bar.colors. classname ## _border = sstrdup(border); \
-                current_bar.colors. classname ## _bg = sstrdup(background); \
-                current_bar.colors. classname ## _text = sstrdup(text); \
-            } else { \
-                /* Old syntax: text, background */ \
-                current_bar.colors. classname ## _bg = sstrdup(background); \
-                current_bar.colors. classname ## _text = sstrdup(border); \
-            } \
-        } \
+#define APPLY_COLORS(classname)                                          \
+    do {                                                                 \
+        if (strcmp(colorclass, #classname) == 0) {                       \
+            if (text != NULL) {                                          \
+                /* New syntax: border, background, text */               \
+                current_bar.colors.classname##_border = sstrdup(border); \
+                current_bar.colors.classname##_bg = sstrdup(background); \
+                current_bar.colors.classname##_text = sstrdup(text);     \
+            } else {                                                     \
+                /* Old syntax: text, background */                       \
+                current_bar.colors.classname##_bg = sstrdup(background); \
+                current_bar.colors.classname##_text = sstrdup(border);   \
+            }                                                            \
+        }                                                                \
     } while (0)
 
     APPLY_COLORS(focused_workspace);
     APPLY_COLORS(active_workspace);
     APPLY_COLORS(inactive_workspace);
     APPLY_COLORS(urgent_workspace);
+    APPLY_COLORS(binding_mode);
 
 #undef APPLY_COLORS
 }
@@ -494,6 +615,10 @@ CFGFUN(bar_tray_output, const char *output) {
     current_bar.tray_output = sstrdup(output);
 }
 
+CFGFUN(bar_tray_padding, const long padding_px) {
+    current_bar.tray_padding = padding_px;
+}
+
 CFGFUN(bar_color_single, const char *colorclass, const char *color) {
     if (strcmp(colorclass, "background") == 0)
         current_bar.colors.background = sstrdup(color);
@@ -520,6 +645,11 @@ CFGFUN(bar_strip_workspace_numbers, const char *value) {
     current_bar.strip_workspace_numbers = eval_boolstr(value);
 }
 
+CFGFUN(bar_start) {
+    TAILQ_INIT(&(current_bar.bar_bindings));
+    current_bar.tray_padding = 2;
+}
+
 CFGFUN(bar_finish) {
     DLOG("\t new bar configuration finished, saving.\n");
     /* Generate a unique ID for this bar if not already configured */