-#undef I3__FILE__
-#define I3__FILE__ "config_directives.c"
/*
* vim:ts=4:sw=4:expandtab
*
* config_directives.c: all config storing functions (see config_parser.c)
*
*/
+#include "all.h"
+
#include <float.h>
#include <stdarg.h>
-#include "all.h"
-
/*******************************************************************************
* Criteria functions.
******************************************************************************/
criteria_next_state = _state;
DLOG("Initializing criteria, current_match = %p, state = %d\n", current_match, _state);
+ match_free(current_match);
match_init(current_match);
}
*
*/
CFGFUN(criteria_add, const char *ctype, const char *cvalue) {
- DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
-
- if (strcmp(ctype, "class") == 0) {
- current_match->class = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "instance") == 0) {
- current_match->instance = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "window_role") == 0) {
- current_match->window_role = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "con_id") == 0) {
- char *end;
- long parsed = strtol(cvalue, &end, 10);
- if (parsed == LONG_MIN ||
- parsed == LONG_MAX ||
- parsed < 0 ||
- (end && *end != '\0')) {
- ELOG("Could not parse con id \"%s\"\n", cvalue);
- } else {
- current_match->con_id = (Con *)parsed;
- DLOG("id as int = %p\n", current_match->con_id);
- }
- return;
- }
-
- if (strcmp(ctype, "id") == 0) {
- char *end;
- long parsed = strtol(cvalue, &end, 10);
- if (parsed == LONG_MIN ||
- parsed == LONG_MAX ||
- parsed < 0 ||
- (end && *end != '\0')) {
- ELOG("Could not parse window id \"%s\"\n", cvalue);
- } else {
- current_match->id = parsed;
- 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;
- }
-
- if (strcmp(ctype, "title") == 0) {
- current_match->title = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "urgent") == 0) {
- if (strcasecmp(cvalue, "latest") == 0 ||
- strcasecmp(cvalue, "newest") == 0 ||
- strcasecmp(cvalue, "recent") == 0 ||
- strcasecmp(cvalue, "last") == 0) {
- current_match->urgent = U_LATEST;
- } else if (strcasecmp(cvalue, "oldest") == 0 ||
- strcasecmp(cvalue, "first") == 0) {
- current_match->urgent = U_OLDEST;
- }
- return;
- }
-
- if (strcmp(ctype, "workspace") == 0) {
- current_match->workspace = regex_new(cvalue);
- return;
- }
-
- ELOG("Unknown criterion: %s\n", ctype);
+ match_parse_property(current_match, ctype, cvalue);
}
-/* TODO: refactor the above criteria code into a single file (with src/commands.c). */
-
/*******************************************************************************
* Utility functions
******************************************************************************/
font_pattern = sstrdup(font);
}
-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);
+CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *exclude_titlebar, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, border, whole_window, exclude_titlebar, command, DEFAULT_BINDING_MODE, false);
}
/*******************************************************************************
******************************************************************************/
static char *current_mode;
+static bool current_mode_pango_markup;
-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(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *exclude_titlebar, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, border, whole_window, exclude_titlebar, command, current_mode, current_mode_pango_markup);
}
-CFGFUN(enter_mode, const char *modename) {
+CFGFUN(enter_mode, const char *pango_markup, const char *modename) {
if (strcasecmp(modename, DEFAULT_BINDING_MODE) == 0) {
ELOG("You cannot use the name %s for your mode\n", DEFAULT_BINDING_MODE);
- exit(1);
+ return;
}
+
+ struct Mode *mode;
+ SLIST_FOREACH(mode, &modes, modes) {
+ if (strcmp(mode->name, modename) == 0) {
+ ELOG("The binding mode with name \"%s\" is defined at least twice.\n", modename);
+ }
+ }
+
DLOG("\t now in mode %s\n", modename);
FREE(current_mode);
current_mode = sstrdup(modename);
+ current_mode_pango_markup = (pango_markup != NULL);
}
CFGFUN(exec, const char *exectype, const char *no_startup_id, const char *command) {
config.default_layout = L_TABBED;
}
-CFGFUN(new_window, const char *windowtype, const char *border, const long width) {
+CFGFUN(default_border, const char *windowtype, const char *border, const long width) {
int border_style;
int border_width;
border_width = width;
}
- if (strcmp(windowtype, "new_window") == 0) {
+ if ((strcmp(windowtype, "default_border") == 0) ||
+ (strcmp(windowtype, "new_window") == 0)) {
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;
}
CFGFUN(hide_edge_borders, const char *borders) {
- if (strcmp(borders, "vertical") == 0)
- config.hide_edge_borders = ADJ_LEFT_SCREEN_EDGE | ADJ_RIGHT_SCREEN_EDGE;
+ if (strcmp(borders, "smart") == 0)
+ config.hide_edge_borders = HEBM_SMART;
+ else if (strcmp(borders, "vertical") == 0)
+ config.hide_edge_borders = HEBM_VERTICAL;
else if (strcmp(borders, "horizontal") == 0)
- config.hide_edge_borders = ADJ_UPPER_SCREEN_EDGE | ADJ_LOWER_SCREEN_EDGE;
+ config.hide_edge_borders = HEBM_HORIZONTAL;
else if (strcmp(borders, "both") == 0)
- config.hide_edge_borders = ADJ_LEFT_SCREEN_EDGE | ADJ_RIGHT_SCREEN_EDGE | ADJ_UPPER_SCREEN_EDGE | ADJ_LOWER_SCREEN_EDGE;
+ config.hide_edge_borders = HEBM_BOTH;
else if (strcmp(borders, "none") == 0)
- config.hide_edge_borders = ADJ_NONE;
+ config.hide_edge_borders = HEBM_NONE;
else if (eval_boolstr(borders))
- config.hide_edge_borders = ADJ_LEFT_SCREEN_EDGE | ADJ_RIGHT_SCREEN_EDGE;
+ config.hide_edge_borders = HEBM_VERTICAL;
else
- config.hide_edge_borders = ADJ_NONE;
+ config.hide_edge_borders = HEBM_NONE;
}
CFGFUN(focus_follows_mouse, const char *value) {
config.force_xinerama = eval_boolstr(value);
}
+CFGFUN(disable_randr15, const char *value) {
+ config.disable_randr15 = eval_boolstr(value);
+}
+
+CFGFUN(focus_wrapping, const char *value) {
+ if (strcmp(value, "force") == 0) {
+ config.focus_wrapping = FOCUS_WRAPPING_FORCE;
+ } else if (eval_boolstr(value)) {
+ config.focus_wrapping = FOCUS_WRAPPING_ON;
+ } else {
+ config.focus_wrapping = FOCUS_WRAPPING_OFF;
+ }
+}
+
CFGFUN(force_focus_wrapping, const char *value) {
- config.force_focus_wrapping = eval_boolstr(value);
+ /* Legacy syntax. */
+ if (eval_boolstr(value)) {
+ config.focus_wrapping = FOCUS_WRAPPING_FORCE;
+ } else {
+ /* For "force_focus_wrapping off", don't enable or disable
+ * focus wrapping, just ensure it's not forced. */
+ if (config.focus_wrapping == FOCUS_WRAPPING_FORCE) {
+ config.focus_wrapping = FOCUS_WRAPPING_ON;
+ }
+ }
}
CFGFUN(workspace_back_and_forth, const char *value) {
}
CFGFUN(fake_outputs, const char *outputs) {
+ free(config.fake_outputs);
config.fake_outputs = sstrdup(outputs);
}
DLOG("Set new focus_on_window_activation mode = %i.\n", config.focus_on_window_activation);
}
+CFGFUN(title_align, const char *alignment) {
+ if (strcmp(alignment, "left") == 0) {
+ config.title_align = ALIGN_LEFT;
+ } else if (strcmp(alignment, "center") == 0) {
+ config.title_align = ALIGN_CENTER;
+ } else if (strcmp(alignment, "right") == 0) {
+ config.title_align = ALIGN_RIGHT;
+ } else {
+ assert(false);
+ }
+}
+
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);
+CFGFUN(workspace, const char *workspace, const char *outputs) {
+ DLOG("Assigning workspace \"%s\" to outputs \"%s\"\n", workspace, outputs);
/* Check for earlier assignments of the same workspace so that we
* don’t have assignments of a single workspace to different
* outputs */
struct Workspace_Assignment *assignment;
- bool duplicate = false;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
if (strcasecmp(assignment->name, workspace) == 0) {
ELOG("You have a duplicate workspace assignment for workspace \"%s\"\n",
workspace);
- assignment->output = sstrdup(output);
- duplicate = true;
+ return;
}
}
- if (!duplicate) {
+
+ char *buf = sstrdup(outputs);
+ char *output = strtok(buf, " ");
+ while (output != NULL) {
assignment = scalloc(1, sizeof(struct Workspace_Assignment));
assignment->name = sstrdup(workspace);
assignment->output = sstrdup(output);
TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments);
+ output = strtok(NULL, " ");
}
+ free(buf);
}
CFGFUN(ipc_socket, const char *path) {
+ free(config.ipc_socket_path);
config.ipc_socket_path = sstrdup(path);
}
CFGFUN(restart_state, const char *path) {
+ free(config.restart_state_path);
config.restart_state_path = sstrdup(path);
}
CFGFUN(color_single, const char *colorclass, const char *color) {
/* used for client.background only currently */
- config.client.background = get_colorpixel(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); \
- } \
- } \
+ config.client.background = draw_util_hex_to_color(color);
+}
+
+CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator, const char *child_border) {
+#define APPLY_COLORS(classname) \
+ do { \
+ if (strcmp(colorclass, "client." #classname) == 0) { \
+ config.client.classname.border = draw_util_hex_to_color(border); \
+ config.client.classname.background = draw_util_hex_to_color(background); \
+ config.client.classname.text = draw_util_hex_to_color(text); \
+ if (indicator != NULL) { \
+ config.client.classname.indicator = draw_util_hex_to_color(indicator); \
+ } \
+ if (child_border != NULL) { \
+ config.client.classname.child_border = draw_util_hex_to_color(child_border); \
+ } else { \
+ config.client.classname.child_border = config.client.classname.background; \
+ } \
+ } \
} while (0)
APPLY_COLORS(focused_inactive);
#undef APPLY_COLORS
}
-CFGFUN(assign, const char *workspace) {
+CFGFUN(assign_output, const char *output) {
+ if (match_is_empty(current_match)) {
+ ELOG("Match is empty, ignoring this assignment\n");
+ return;
+ }
+
+ if (current_match->window_mode != WM_ANY) {
+ ELOG("Assignments using window mode (floating/tiling) is not supported\n");
+ return;
+ }
+
+ DLOG("New assignment, using above criteria, to output \"%s\".\n", output);
+ Assignment *assignment = scalloc(1, sizeof(Assignment));
+ match_copy(&(assignment->match), current_match);
+ assignment->type = A_TO_OUTPUT;
+ assignment->dest.output = sstrdup(output);
+ TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
+}
+
+CFGFUN(assign, const char *workspace, bool is_number) {
if (match_is_empty(current_match)) {
ELOG("Match is empty, ignoring this assignment\n");
return;
}
+
+ if (current_match->window_mode != WM_ANY) {
+ ELOG("Assignments using window mode (floating/tiling) is not supported\n");
+ return;
+ }
+
+ if (is_number && ws_name_to_number(workspace) == -1) {
+ ELOG("Could not parse initial part of \"%s\" as a number.\n", workspace);
+ return;
+ }
+
DLOG("New assignment, using above criteria, to workspace \"%s\".\n", workspace);
Assignment *assignment = scalloc(1, sizeof(Assignment));
match_copy(&(assignment->match), current_match);
- assignment->type = A_TO_WORKSPACE;
+ assignment->type = is_number ? A_TO_WORKSPACE_NUMBER : A_TO_WORKSPACE;
assignment->dest.workspace = sstrdup(workspace);
TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
}
TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
}
+CFGFUN(ipc_kill_timeout, const long timeout_ms) {
+ ipc_set_kill_timeout(timeout_ms / 1000.0);
+}
+
/*******************************************************************************
* Bar configuration (i3bar)
******************************************************************************/
-static Barconfig current_bar;
+static Barconfig *current_bar;
CFGFUN(bar_font, const char *font) {
- FREE(current_bar.font);
- current_bar.font = sstrdup(font);
+ FREE(current_bar->font);
+ current_bar->font = sstrdup(font);
}
CFGFUN(bar_separator_symbol, const char *separator) {
- FREE(current_bar.separator_symbol);
- current_bar.separator_symbol = sstrdup(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));
+ 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);
+ 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);
+ current_bar->id = sstrdup(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[current_bar.num_outputs] = sstrdup(output);
- current_bar.num_outputs = new_outputs;
+ int new_outputs = current_bar->num_outputs + 1;
+ 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;
}
CFGFUN(bar_verbose, const char *verbose) {
- current_bar.verbose = eval_boolstr(verbose);
-}
-
-CFGFUN(bar_modifier, const char *modifier) {
- if (strcmp(modifier, "Mod1") == 0)
- current_bar.modifier = M_MOD1;
- else if (strcmp(modifier, "Mod2") == 0)
- current_bar.modifier = M_MOD2;
- else if (strcmp(modifier, "Mod3") == 0)
- current_bar.modifier = M_MOD3;
- else if (strcmp(modifier, "Mod4") == 0)
- current_bar.modifier = M_MOD4;
- else if (strcmp(modifier, "Mod5") == 0)
- current_bar.modifier = M_MOD5;
- 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;
-}
-
-static void bar_configure_binding(const char *button, const char *command) {
+ current_bar->verbose = eval_boolstr(verbose);
+}
+
+CFGFUN(bar_modifier, const char *modifiers) {
+ current_bar->modifier = modifiers ? event_state_from_str(modifiers) : XCB_NONE;
+}
+
+static void bar_configure_binding(const char *button, const char *release, 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;
ELOG("Button \"%s\" does not seem to be in format 'buttonX'.\n", button);
return;
}
+ const bool release_bool = release != NULL;
struct Barbinding *current;
- TAILQ_FOREACH(current, &(current_bar.bar_bindings), bindings) {
- if (current->input_code == input_code) {
+ TAILQ_FOREACH(current, &(current_bar->bar_bindings), bindings) {
+ if (current->input_code == input_code && current->release == release_bool) {
ELOG("command for button %s was already specified, ignoring.\n", button);
return;
}
}
struct Barbinding *new_binding = scalloc(1, sizeof(struct Barbinding));
+ new_binding->release = release_bool;
new_binding->input_code = input_code;
new_binding->command = sstrdup(command);
- TAILQ_INSERT_TAIL(&(current_bar.bar_bindings), new_binding, bindings);
+ 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);
+ bar_configure_binding("button4", NULL, 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);
+ bar_configure_binding("button5", NULL, command);
}
-CFGFUN(bar_bindsym, const char *button, const char *command) {
- bar_configure_binding(button, command);
+CFGFUN(bar_bindsym, const char *button, const char *release, const char *command) {
+ bar_configure_binding(button, release, command);
}
CFGFUN(bar_position, const char *position) {
- current_bar.position = (strcmp(position, "top") == 0 ? P_TOP : P_BOTTOM);
+ current_bar->position = (strcmp(position, "top") == 0 ? P_TOP : P_BOTTOM);
}
CFGFUN(bar_i3bar_command, const char *i3bar_command) {
- FREE(current_bar.i3bar_command);
- current_bar.i3bar_command = sstrdup(i3bar_command);
+ FREE(current_bar->i3bar_command);
+ current_bar->i3bar_command = sstrdup(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);
}
CFGFUN(bar_socket_path, const char *socket_path) {
- FREE(current_bar.socket_path);
- current_bar.socket_path = sstrdup(socket_path);
+ FREE(current_bar->socket_path);
+ current_bar->socket_path = sstrdup(socket_path);
}
CFGFUN(bar_tray_output, const char *output) {
- FREE(current_bar.tray_output);
- current_bar.tray_output = sstrdup(output);
+ struct tray_output_t *tray_output = scalloc(1, sizeof(struct tray_output_t));
+ tray_output->output = sstrdup(output);
+ TAILQ_INSERT_TAIL(&(current_bar->tray_outputs), tray_output, tray_outputs);
}
CFGFUN(bar_tray_padding, const long padding_px) {
- current_bar.tray_padding = 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);
+ current_bar->colors.background = sstrdup(color);
else if (strcmp(colorclass, "separator") == 0)
- current_bar.colors.separator = sstrdup(color);
+ current_bar->colors.separator = sstrdup(color);
+ else if (strcmp(colorclass, "statusline") == 0)
+ current_bar->colors.statusline = sstrdup(color);
+ else if (strcmp(colorclass, "focused_background") == 0)
+ current_bar->colors.focused_background = sstrdup(color);
+ else if (strcmp(colorclass, "focused_separator") == 0)
+ current_bar->colors.focused_separator = sstrdup(color);
else
- current_bar.colors.statusline = sstrdup(color);
+ current_bar->colors.focused_statusline = sstrdup(color);
}
CFGFUN(bar_status_command, const char *command) {
- FREE(current_bar.status_command);
- current_bar.status_command = sstrdup(command);
+ FREE(current_bar->status_command);
+ current_bar->status_command = sstrdup(command);
}
CFGFUN(bar_binding_mode_indicator, const char *value) {
- current_bar.hide_binding_mode_indicator = !eval_boolstr(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);
+ current_bar->hide_workspace_buttons = !eval_boolstr(value);
}
CFGFUN(bar_strip_workspace_numbers, const char *value) {
- current_bar.strip_workspace_numbers = eval_boolstr(value);
+ current_bar->strip_workspace_numbers = eval_boolstr(value);
+}
+
+CFGFUN(bar_strip_workspace_name, const char *value) {
+ current_bar->strip_workspace_name = eval_boolstr(value);
}
CFGFUN(bar_start) {
- TAILQ_INIT(&(current_bar.bar_bindings));
- current_bar.tray_padding = 2;
+ current_bar = scalloc(1, sizeof(struct Barconfig));
+ TAILQ_INIT(&(current_bar->bar_bindings));
+ TAILQ_INIT(&(current_bar->tray_outputs));
+ current_bar->tray_padding = 2;
+ current_bar->modifier = XCB_KEY_BUT_MASK_MOD_4;
}
CFGFUN(bar_finish) {
DLOG("\t new bar configuration finished, saving.\n");
/* Generate a unique ID for this bar if not already configured */
- if (!current_bar.id)
- sasprintf(¤t_bar.id, "bar-%d", config.number_barconfigs);
+ if (current_bar->id == NULL)
+ sasprintf(¤t_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)
- current_bar.font = sstrdup(font_pattern);
-
- /* Copy the current (static) structure into a dynamically allocated
- * one, then cleanup our static one. */
- Barconfig *bar_config = scalloc(1, sizeof(Barconfig));
- memcpy(bar_config, ¤t_bar, sizeof(Barconfig));
- TAILQ_INSERT_TAIL(&barconfigs, bar_config, configs);
+ if (current_bar->font == NULL && font_pattern != NULL)
+ current_bar->font = sstrdup(font_pattern);
- memset(¤t_bar, '\0', sizeof(Barconfig));
+ TAILQ_INSERT_TAIL(&barconfigs, current_bar, configs);
+ /* Simply reset the pointer, but don't free the resources. */
+ current_bar = NULL;
}
projects / i3 / i3 / blobdiff