X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig_directives.c;h=ff1c280e4f6d7fac4adb51c70510b6d5722694a8;hb=67ec2333ee659e4b8ce90e75b94a518a2dee81c0;hp=0a83d46febefd48644964c4b4086c23db1d4207c;hpb=d5358a749e3f4eed45144a2c78032c4163ea2367;p=i3%2Fi3 diff --git a/src/config_directives.c b/src/config_directives.c index 0a83d46f..ff1c280e 100644 --- a/src/config_directives.c +++ b/src/config_directives.c @@ -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) * @@ -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. ******************************************************************************/ @@ -65,7 +55,7 @@ CFGFUN(criteria_add, const char *ctype, const char *cvalue) { } if (strcmp(ctype, "window_role") == 0) { - current_match->role = regex_new(cvalue); + current_match->window_role = regex_new(cvalue); return; } @@ -78,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; } @@ -94,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; @@ -140,7 +155,11 @@ static bool eval_boolstr(const char *str) { 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; @@ -169,83 +188,47 @@ static 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); } -// 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); - TAILQ_INSERT_TAIL(bindings, new_binding, bindings); +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 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); - 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); - 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 *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) { - 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) { @@ -280,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) { @@ -289,13 +273,11 @@ 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; @@ -314,12 +296,16 @@ 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 (%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.default_border_width = border_width; } CFGFUN(hide_edge_borders, const char *borders) { @@ -333,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); } @@ -360,6 +354,27 @@ CFGFUN(force_display_urgency_hint, const long duration_ms) { config.workspace_urgency_timer = duration_ms / 1000.0; } +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", 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 @@ -392,8 +407,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) { @@ -402,22 +422,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 } @@ -435,6 +456,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"); + 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) ******************************************************************************/ @@ -446,13 +480,26 @@ 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, "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; } @@ -479,6 +526,16 @@ CFGFUN(bar_modifier, const char *modifier) { 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); } @@ -489,20 +546,20 @@ 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); @@ -537,21 +594,25 @@ 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)