X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig_directives.c;h=960dee5bfdde70f6aaa227f511f2230bb6b57478;hb=dc05d905c1ab0978ca98b3e15ff96d18df55c182;hp=039cb29e65a4769b96e10b5690e595e69aa7b810;hpb=9bf161710b20238d377e8f14c29539e8d7e16e82;p=i3%2Fi3 diff --git a/src/config_directives.c b/src/config_directives.c index 039cb29e..960dee5b 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) * @@ -42,81 +42,9 @@ CFGFUN(criteria_pop_state) { * */ 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, "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; - } - - 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 ******************************************************************************/ @@ -131,32 +59,40 @@ static bool eval_boolstr(const char *str) { } /* - * A utility function to convert a string of modifiers to the corresponding bit - * mask. + * A utility function to convert a string containing the group and modifiers to + * the corresponding bit mask. */ -uint32_t modifiers_from_str(const char *str) { +i3_event_state_mask_t event_state_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; + i3_event_state_mask_t result = 0; if (str == NULL) return result; if (strstr(str, "Mod1") != NULL) - result |= BIND_MOD1; + result |= XCB_KEY_BUT_MASK_MOD_1; if (strstr(str, "Mod2") != NULL) - result |= BIND_MOD2; + result |= XCB_KEY_BUT_MASK_MOD_2; if (strstr(str, "Mod3") != NULL) - result |= BIND_MOD3; + result |= XCB_KEY_BUT_MASK_MOD_3; if (strstr(str, "Mod4") != NULL) - result |= BIND_MOD4; + result |= XCB_KEY_BUT_MASK_MOD_4; if (strstr(str, "Mod5") != NULL) - result |= BIND_MOD5; + result |= XCB_KEY_BUT_MASK_MOD_5; if (strstr(str, "Control") != NULL || strstr(str, "Ctrl") != NULL) - result |= BIND_CONTROL; + result |= XCB_KEY_BUT_MASK_CONTROL; if (strstr(str, "Shift") != NULL) - result |= BIND_SHIFT; - if (strstr(str, "Mode_switch") != NULL) - result |= BIND_MODE_SWITCH; + result |= XCB_KEY_BUT_MASK_SHIFT; + + if (strstr(str, "Group1") != NULL) + result |= (I3_XKB_GROUP_MASK_1 << 16); + if (strstr(str, "Group2") != NULL || + strstr(str, "Mode_switch") != NULL) + result |= (I3_XKB_GROUP_MASK_2 << 16); + if (strstr(str, "Group3") != NULL) + result |= (I3_XKB_GROUP_MASK_3 << 16); + if (strstr(str, "Group4") != NULL) + result |= (I3_XKB_GROUP_MASK_4 << 16); return result; } @@ -171,8 +107,8 @@ CFGFUN(font, const char *font) { font_pattern = sstrdup(font); } -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); +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, false); } /******************************************************************************* @@ -180,12 +116,13 @@ CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, co ******************************************************************************/ 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 *whole_window, const char *command) { - configure_binding(bindtype, modifiers, key, release, 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 *command) { + configure_binding(bindtype, modifiers, key, release, border, whole_window, 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); @@ -193,6 +130,7 @@ CFGFUN(enter_mode, const char *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) { @@ -212,7 +150,7 @@ CFGFUN(for_window, const char *command) { return; } DLOG("\t should execute command %s for the criteria mentioned above\n", command); - Assignment *assignment = scalloc(sizeof(Assignment)); + Assignment *assignment = scalloc(1, sizeof(Assignment)); assignment->type = A_COMMAND; match_copy(&(assignment->match), current_match); assignment->dest.command = sstrdup(command); @@ -230,7 +168,7 @@ CFGFUN(floating_maximum_size, const long width, const long height) { } CFGFUN(floating_modifier, const char *modifiers) { - config.floating_modifier = modifiers_from_str(modifiers); + config.floating_modifier = event_state_from_str(modifiers); } CFGFUN(default_orientation, const char *orientation) { @@ -343,7 +281,11 @@ CFGFUN(focus_on_window_activation, const char *mode) { return; } - DLOG("Set new focus_on_window_activation mode = %i", config.focus_on_window_activation); + 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) { @@ -362,7 +304,7 @@ CFGFUN(workspace, const char *workspace, const char *output) { } } if (!duplicate) { - assignment = scalloc(sizeof(struct Workspace_Assignment)); + assignment = scalloc(1, sizeof(struct Workspace_Assignment)); assignment->name = sstrdup(workspace); assignment->output = sstrdup(output); TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments); @@ -419,14 +361,27 @@ 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); - Assignment *assignment = scalloc(sizeof(Assignment)); + 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->dest.workspace = sstrdup(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(1, sizeof(Assignment)); + match_copy(&(assignment->match), current_match); + assignment->type = A_NO_FOCUS; + TAILQ_INSERT_TAIL(&assignments, assignment, assignments); +} + /******************************************************************************* * Bar configuration (i3bar) ******************************************************************************/ @@ -484,14 +439,44 @@ 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(1, 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) { - FREE(current_bar.wheel_up_cmd); - current_bar.wheel_up_cmd = sstrdup(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) { - FREE(current_bar.wheel_down_cmd); - current_bar.wheel_down_cmd = sstrdup(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) { @@ -524,6 +509,7 @@ CFGFUN(bar_color, const char *colorclass, const char *border, const char *backgr APPLY_COLORS(active_workspace); APPLY_COLORS(inactive_workspace); APPLY_COLORS(urgent_workspace); + APPLY_COLORS(binding_mode); #undef APPLY_COLORS } @@ -538,13 +524,23 @@ 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); else if (strcmp(colorclass, "separator") == 0) current_bar.colors.separator = sstrdup(color); - else + 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.focused_statusline = sstrdup(color); } CFGFUN(bar_status_command, const char *command) { @@ -564,6 +560,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 */ @@ -578,7 +579,7 @@ CFGFUN(bar_finish) { /* Copy the current (static) structure into a dynamically allocated * one, then cleanup our static one. */ - Barconfig *bar_config = scalloc(sizeof(Barconfig)); + Barconfig *bar_config = scalloc(1, sizeof(Barconfig)); memcpy(bar_config, ¤t_bar, sizeof(Barconfig)); TAILQ_INSERT_TAIL(&barconfigs, bar_config, configs);