#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.
******************************************************************************/
}
if (strcmp(ctype, "window_role") == 0) {
- current_match->role = regex_new(cvalue);
+ current_match->window_role = regex_new(cvalue);
return;
}
(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;
}
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;
}
strcasecmp(str, "active") == 0);
}
-static uint32_t modifiers_from_str(const char *str) {
+/*
+ * A utility function to convert a string of modifiers to the corresponding bit
+ * mask.
+ */
+uint32_t modifiers_from_str(const char *str) {
/* It might be better to use strtok() here, but the simpler strstr() should
* do for now. */
uint32_t result = 0;
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;
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);
}
-// 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);
- }
- new_binding->mods = modifiers_from_str(modifiers);
- new_binding->command = sstrdup(command);
- TAILQ_INSERT_TAIL(bindings, new_binding, bindings);
+CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, whole_window, command, DEFAULT_BINDING_MODE);
}
-
/*******************************************************************************
* Mode handling
******************************************************************************/
-static struct bindings_head *current_bindings;
+static char *current_mode;
-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);
- }
- new_binding->mods = modifiers_from_str(modifiers);
- new_binding->command = sstrdup(command);
- TAILQ_INSERT_TAIL(current_bindings, new_binding, bindings);
+CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, whole_window, command, current_mode);
}
CFGFUN(enter_mode, const char *modename) {
- if (strcasecmp(modename, "default") == 0) {
- ELOG("You cannot use the name \"default\" for your mode\n");
+ if (strcasecmp(modename, DEFAULT_BINDING_MODE) == 0) {
+ ELOG("You cannot use the name %s for your mode\n", DEFAULT_BINDING_MODE);
exit(1);
}
DLOG("\t now in mode %s\n", modename);
- struct Mode *mode = scalloc(sizeof(struct Mode));
- mode->name = sstrdup(modename);
- mode->bindings = scalloc(sizeof(struct bindings_head));
- TAILQ_INIT(mode->bindings);
- current_bindings = mode->bindings;
- SLIST_INSERT_HEAD(&modes, mode, modes);
+ FREE(current_mode);
+ current_mode = sstrdup(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) {
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) {
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) {
- // FIXME: when using new_float *and* new_window with different border
- // types, this breaks because default_border_width gets overwritten.
-
int border_style;
int border_width;
}
if (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;
+ config.default_border_width = logical_px(border_width);
} else {
+ 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 = logical_px(border_width);
}
}
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);
}
}
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) {
}
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
}
}
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) {
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;
}
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;
}
+CFGFUN(bar_wheel_up_cmd, const char *command) {
+ FREE(current_bar.wheel_up_cmd);
+ current_bar.wheel_up_cmd = sstrdup(command);
+}
+
+CFGFUN(bar_wheel_down_cmd, const char *command) {
+ FREE(current_bar.wheel_down_cmd);
+ current_bar.wheel_down_cmd = sstrdup(command);
+}
+
CFGFUN(bar_position, const char *position) {
current_bar.position = (strcmp(position, "top") == 0 ? P_TOP : P_BOTTOM);
}
}
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_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) {
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_strip_workspace_numbers, const char *value) {
+ current_bar.strip_workspace_numbers = 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(¤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)
projects / i3 / i3 / blobdiff