X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig.c;h=9631b2160237732ed404ad02757ab064b8d87b9b;hb=HEAD;hp=c030eb9a8ef93461bd5a73e90a3eaa2e1662e41d;hpb=5cd7979e62613e1d015f71cb85430abfddc2109f;p=i3%2Fi3 diff --git a/src/config.c b/src/config.c index c030eb9a..9631b216 100644 --- a/src/config.c +++ b/src/config.c @@ -1,10 +1,8 @@ -#undef I3__FILE__ -#define I3__FILE__ "config.c" /* * 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.c: Configuration file (calling the parser (src/config_parser.c) with * the correct path, switching key bindings mode). @@ -12,15 +10,15 @@ */ #include "all.h" -/* We need Xlib for XStringToKeysym */ -#include +#include char *current_configpath = NULL; +char *current_config = NULL; Config config; struct modes_head modes; struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs); -/** +/* * Ungrabs all keys, to be called before re-grabbing the keys because of a * mapping_notify event or a configuration file reload * @@ -30,309 +28,42 @@ void ungrab_all_keys(xcb_connection_t *conn) { xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY); } -static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint32_t keycode) { - DLOG("Grabbing %d with modifiers %d (with mod_mask_lock %d)\n", keycode, bind->mods, bind->mods | XCB_MOD_MASK_LOCK); - /* Grab the key in all combinations */ - #define GRAB_KEY(modifier) \ - do { \ - xcb_grab_key(conn, 0, root, modifier, keycode, \ - XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC); \ - } while (0) - int mods = bind->mods; - if ((bind->mods & BIND_MODE_SWITCH) != 0) { - mods &= ~BIND_MODE_SWITCH; - if (mods == 0) - mods = XCB_MOD_MASK_ANY; - } - GRAB_KEY(mods); - GRAB_KEY(mods | xcb_numlock_mask); - GRAB_KEY(mods | XCB_MOD_MASK_LOCK); - GRAB_KEY(mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK); -} - -/* - * Returns a pointer to the Binding with the specified modifiers and keycode - * or NULL if no such binding exists. - * - */ -Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode) { - Binding *bind; - - if (!key_release) { - /* On a KeyPress event, we first reset all - * B_UPON_KEYRELEASE_IGNORE_MODS bindings back to B_UPON_KEYRELEASE */ - TAILQ_FOREACH(bind, bindings, bindings) { - if (bind->release == B_UPON_KEYRELEASE_IGNORE_MODS) - bind->release = B_UPON_KEYRELEASE; - } - } - - TAILQ_FOREACH(bind, bindings, bindings) { - /* First compare the modifiers (unless this is a - * B_UPON_KEYRELEASE_IGNORE_MODS binding and this is a KeyRelease - * event) */ - if (bind->mods != modifiers && - (bind->release != B_UPON_KEYRELEASE_IGNORE_MODS || - !key_release)) - continue; - - /* If a symbol was specified by the user, we need to look in - * the array of translated keycodes for the event’s keycode */ - if (bind->symbol != NULL) { - if (memmem(bind->translated_to, - bind->number_keycodes * sizeof(xcb_keycode_t), - &keycode, sizeof(xcb_keycode_t)) == NULL) - continue; - } else { - /* This case is easier: The user specified a keycode */ - if (bind->keycode != keycode) - continue; - } - - /* If this keybinding is a KeyRelease binding, it matches the key which - * the user pressed. We therefore mark it as - * B_UPON_KEYRELEASE_IGNORE_MODS for later, so that the user can - * release the modifiers before the actual key and the KeyRelease will - * still be matched. */ - if (bind->release == B_UPON_KEYRELEASE && !key_release) - bind->release = B_UPON_KEYRELEASE_IGNORE_MODS; - - /* Check if the binding is for a KeyPress or a KeyRelease event */ - if ((bind->release == B_UPON_KEYPRESS && key_release) || - (bind->release >= B_UPON_KEYRELEASE && !key_release)) - continue; - - break; - } - - return (bind == TAILQ_END(bindings) ? NULL : bind); -} - -/* - * Translates keysymbols to keycodes for all bindings which use keysyms. - * - */ -void translate_keysyms(void) { - Binding *bind; - xcb_keysym_t keysym; - int col; - xcb_keycode_t i, - min_keycode = xcb_get_setup(conn)->min_keycode, - max_keycode = xcb_get_setup(conn)->max_keycode; - - TAILQ_FOREACH(bind, bindings, bindings) { - if (bind->keycode > 0) - continue; - - /* We need to translate the symbol to a keycode */ - keysym = XStringToKeysym(bind->symbol); - if (keysym == NoSymbol) { - ELOG("Could not translate string to key symbol: \"%s\"\n", - bind->symbol); - continue; - } - - /* Base column we use for looking up key symbols. We always consider - * the base column and the corresponding shift column, so without - * mode_switch, we look in 0 and 1, with mode_switch we look in 2 and - * 3. */ - col = (bind->mods & BIND_MODE_SWITCH ? 2 : 0); - - FREE(bind->translated_to); - bind->number_keycodes = 0; - - for (i = min_keycode; i && i <= max_keycode; i++) { - if ((xcb_key_symbols_get_keysym(keysyms, i, col) != keysym) && - (xcb_key_symbols_get_keysym(keysyms, i, col+1) != keysym)) - continue; - bind->number_keycodes++; - bind->translated_to = srealloc(bind->translated_to, - (sizeof(xcb_keycode_t) * - bind->number_keycodes)); - bind->translated_to[bind->number_keycodes-1] = i; - } - - DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, - bind->number_keycodes); - } -} - -/* - * Grab the bound keys (tell X to send us keypress events for those keycodes) - * - */ -void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch) { - Binding *bind; - TAILQ_FOREACH(bind, bindings, bindings) { - if ((bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) == 0) || - (!bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) != 0)) - continue; - - /* The easy case: the user specified a keycode directly. */ - if (bind->keycode > 0) { - grab_keycode_for_binding(conn, bind, bind->keycode); - continue; - } - - xcb_keycode_t *walk = bind->translated_to; - for (int i = 0; i < bind->number_keycodes; i++) - grab_keycode_for_binding(conn, bind, *walk++); - } -} - -/* - * Switches the key bindings to the given mode, if the mode exists - * - */ -void switch_mode(const char *new_mode) { - struct Mode *mode; - - LOG("Switching to mode %s\n", new_mode); - - SLIST_FOREACH(mode, &modes, modes) { - if (strcasecmp(mode->name, new_mode) != 0) - continue; - - ungrab_all_keys(conn); - bindings = mode->bindings; - translate_keysyms(); - grab_all_keys(conn, false); - - char *event_msg; - sasprintf(&event_msg, "{\"change\":\"%s\"}", mode->name); - - ipc_send_event("mode", I3_IPC_EVENT_MODE, event_msg); - FREE(event_msg); - - return; - } - - ELOG("ERROR: Mode not found\n"); -} - /* * Sends the current bar configuration as an event to all barconfig_update listeners. - * This update mechnism currently only includes the hidden_state and the mode in the config. * */ -void update_barconfig() { +void update_barconfig(void) { Barconfig *current; TAILQ_FOREACH(current, &barconfigs, configs) { - /* Build json message */ - char *hidden_state; - switch (current->hidden_state) { - case S_SHOW: - hidden_state ="show"; - break; - case S_HIDE: - default: - hidden_state = "hide"; - break; - } - - char *mode; - switch (current->mode) { - case M_HIDE: - mode ="hide"; - break; - case M_INVISIBLE: - mode ="invisible"; - break; - case M_DOCK: - default: - mode = "dock"; - break; - } - - /* Send an event to all barconfig listeners*/ - char *event_msg; - sasprintf(&event_msg, "{ \"id\":\"%s\", \"hidden_state\":\"%s\", \"mode\":\"%s\" }", current->id, hidden_state, mode); - - ipc_send_event("barconfig_update", I3_IPC_EVENT_BARCONFIG_UPDATE, event_msg); - FREE(event_msg); + ipc_send_barconfig_update_event(current); } } -/* - * Get the path of the first configuration file found. If override_configpath - * is specified, that path is returned and saved for further calls. Otherwise, - * checks the home directory first, then the system directory first, always - * taking into account the XDG Base Directory Specification ($XDG_CONFIG_HOME, - * $XDG_CONFIG_DIRS) - * - */ -static char *get_config_path(const char *override_configpath) { - char *xdg_config_home, *xdg_config_dirs, *config_path; - - static const char *saved_configpath = NULL; - - if (override_configpath != NULL) { - saved_configpath = override_configpath; - return sstrdup(saved_configpath); - } - - if (saved_configpath != NULL) - return sstrdup(saved_configpath); - - /* 1: check the traditional path under the home directory */ - config_path = resolve_tilde("~/.i3/config"); - if (path_exists(config_path)) - return config_path; - free(config_path); - - /* 2: check for $XDG_CONFIG_HOME/i3/config */ - if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL) - xdg_config_home = "~/.config"; - - xdg_config_home = resolve_tilde(xdg_config_home); - sasprintf(&config_path, "%s/i3/config", xdg_config_home); - free(xdg_config_home); - - if (path_exists(config_path)) - return config_path; - free(config_path); - - /* 3: check the traditional path under /etc */ - config_path = SYSCONFDIR "/i3/config"; - if (path_exists(config_path)) - return sstrdup(config_path); - - /* 4: check for $XDG_CONFIG_DIRS/i3/config */ - if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) - xdg_config_dirs = "/etc/xdg"; - - char *buf = sstrdup(xdg_config_dirs); - char *tok = strtok(buf, ":"); - while (tok != NULL) { - tok = resolve_tilde(tok); - sasprintf(&config_path, "%s/i3/config", tok); - free(tok); - if (path_exists(config_path)) { - free(buf); - return config_path; - } - free(config_path); - tok = strtok(NULL, ":"); - } - free(buf); - - die("Unable to find the configuration file (looked at " - "~/.i3/config, $XDG_CONFIG_HOME/i3/config, " - SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)"); -} - /* * Finds the configuration file to use (either the one specified by * override_configpath), the user’s one or the system default) and calls * parse_file(). * */ -static void parse_configuration(const char *override_configpath) { - char *path = get_config_path(override_configpath); +bool parse_configuration(const char *override_configpath, bool use_nagbar) { + char *path = get_config_path(override_configpath, true); + if (path == NULL) { + die("Unable to find the configuration file (looked at " + "$XDG_CONFIG_HOME/i3/config, ~/.i3/config, $XDG_CONFIG_DIRS/i3/config " + "and " SYSCONFDIR "/i3/config)"); + } + LOG("Parsing configfile %s\n", path); FREE(current_configpath); current_configpath = path; - parse_file(path); + + /* initialize default bindings if we're just validating the config file */ + if (!use_nagbar && bindings == NULL) { + bindings = scalloc(1, sizeof(struct bindings_head)); + TAILQ_INIT(bindings); + } + + return parse_file(path, use_nagbar); } /* @@ -341,42 +72,52 @@ static void parse_configuration(const char *override_configpath) { */ void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) { if (reload) { + /* If we are currently in a binding mode, we first revert to the + * default since we have no guarantee that the current mode will even + * still exist after parsing the config again. See #2228. */ + switch_mode("default"); + /* First ungrab the keys */ ungrab_all_keys(conn); struct Mode *mode; - Binding *bind; while (!SLIST_EMPTY(&modes)) { mode = SLIST_FIRST(&modes); FREE(mode->name); /* Clear the old binding list */ - bindings = mode->bindings; - while (!TAILQ_EMPTY(bindings)) { - bind = TAILQ_FIRST(bindings); - TAILQ_REMOVE(bindings, bind, bindings); - FREE(bind->translated_to); - FREE(bind->command); - FREE(bind); + while (!TAILQ_EMPTY(mode->bindings)) { + Binding *bind = TAILQ_FIRST(mode->bindings); + TAILQ_REMOVE(mode->bindings, bind, bindings); + binding_free(bind); } - FREE(bindings); + FREE(mode->bindings); + SLIST_REMOVE(&modes, mode, Mode, modes); + FREE(mode); } - struct Assignment *assign; while (!TAILQ_EMPTY(&assignments)) { - assign = TAILQ_FIRST(&assignments); - if (assign->type == A_TO_WORKSPACE) + struct Assignment *assign = TAILQ_FIRST(&assignments); + if (assign->type == A_TO_WORKSPACE || assign->type == A_TO_WORKSPACE_NUMBER) FREE(assign->dest.workspace); - else if (assign->type == A_TO_OUTPUT) - FREE(assign->dest.output); else if (assign->type == A_COMMAND) FREE(assign->dest.command); + else if (assign->type == A_TO_OUTPUT) + FREE(assign->dest.output); match_free(&(assign->match)); TAILQ_REMOVE(&assignments, assign, assignments); FREE(assign); } + while (!TAILQ_EMPTY(&ws_assignments)) { + struct Workspace_Assignment *assign = TAILQ_FIRST(&ws_assignments); + FREE(assign->name); + FREE(assign->output); + TAILQ_REMOVE(&ws_assignments, assign, ws_assignments); + FREE(assign); + } + /* Clear bar configs */ Barconfig *barconfig; while (!TAILQ_EMPTY(&barconfigs)) { @@ -384,14 +125,32 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, FREE(barconfig->id); for (int c = 0; c < barconfig->num_outputs; c++) free(barconfig->outputs[c]); + + while (!TAILQ_EMPTY(&(barconfig->bar_bindings))) { + struct Barbinding *binding = TAILQ_FIRST(&(barconfig->bar_bindings)); + FREE(binding->command); + TAILQ_REMOVE(&(barconfig->bar_bindings), binding, bindings); + FREE(binding); + } + + while (!TAILQ_EMPTY(&(barconfig->tray_outputs))) { + struct tray_output_t *tray_output = TAILQ_FIRST(&(barconfig->tray_outputs)); + FREE(tray_output->output); + TAILQ_REMOVE(&(barconfig->tray_outputs), tray_output, tray_outputs); + FREE(tray_output); + } + FREE(barconfig->outputs); - FREE(barconfig->tray_output); FREE(barconfig->socket_path); FREE(barconfig->status_command); FREE(barconfig->i3bar_command); FREE(barconfig->font); FREE(barconfig->colors.background); FREE(barconfig->colors.statusline); + FREE(barconfig->colors.separator); + FREE(barconfig->colors.focused_background); + FREE(barconfig->colors.focused_statusline); + FREE(barconfig->colors.focused_separator); FREE(barconfig->colors.focused_workspace_border); FREE(barconfig->colors.focused_workspace_bg); FREE(barconfig->colors.focused_workspace_text); @@ -404,53 +163,56 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, FREE(barconfig->colors.urgent_workspace_border); FREE(barconfig->colors.urgent_workspace_bg); FREE(barconfig->colors.urgent_workspace_text); + FREE(barconfig->colors.binding_mode_border); + FREE(barconfig->colors.binding_mode_bg); + FREE(barconfig->colors.binding_mode_text); TAILQ_REMOVE(&barconfigs, barconfig, configs); FREE(barconfig); } - /* Clear workspace names */ -#if 0 - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) - workspace_set_name(ws, NULL); -#endif - - /* Invalidate pixmap caches in case font or colors changed */ Con *con; - TAILQ_FOREACH(con, &all_cons, all_cons) + TAILQ_FOREACH(con, &all_cons, all_cons) { + /* Assignments changed, previously ran assignments are invalid. */ + if (con->window) { + con->window->nr_assignments = 0; + FREE(con->window->ran_assignments); + } + /* Invalidate pixmap caches in case font or colors changed. */ FREE(con->deco_render_params); + } /* Get rid of the current font */ free_font(); + + free(config.ipc_socket_path); + free(config.restart_state_path); + free(config.fake_outputs); } SLIST_INIT(&modes); - struct Mode *default_mode = scalloc(sizeof(struct Mode)); + struct Mode *default_mode = scalloc(1, sizeof(struct Mode)); default_mode->name = sstrdup("default"); - default_mode->bindings = scalloc(sizeof(struct bindings_head)); + default_mode->bindings = scalloc(1, sizeof(struct bindings_head)); TAILQ_INIT(default_mode->bindings); SLIST_INSERT_HEAD(&modes, default_mode, modes); bindings = default_mode->bindings; -#define REQUIRED_OPTION(name) \ - if (config.name == NULL) \ - die("You did not specify required configuration option " #name "\n"); - /* Clear the old config or initialize the data structure */ memset(&config, 0, sizeof(config)); - /* Initialize default colors */ +/* Initialize default colors */ #define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \ - do { \ - x.border = get_colorpixel(cborder); \ - x.background = get_colorpixel(cbackground); \ - x.text = get_colorpixel(ctext); \ - x.indicator = get_colorpixel(cindicator); \ + do { \ + x.border = draw_util_hex_to_color(cborder); \ + x.background = draw_util_hex_to_color(cbackground); \ + x.text = draw_util_hex_to_color(ctext); \ + x.indicator = draw_util_hex_to_color(cindicator); \ + x.child_border = draw_util_hex_to_color(cbackground); \ } while (0) - config.client.background = get_colorpixel("#000000"); + config.client.background = draw_util_hex_to_color("#000000"); INIT_COLOR(config.client.focused, "#4c7899", "#285577", "#ffffff", "#2e9ef4"); INIT_COLOR(config.client.focused_inactive, "#333333", "#5f676a", "#ffffff", "#484e50"); INIT_COLOR(config.client.unfocused, "#333333", "#222222", "#888888", "#292d2e"); @@ -464,9 +226,12 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888", "#000000"); INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff", "#000000"); + config.show_marks = true; + config.default_border = BS_NORMAL; config.default_floating_border = BS_NORMAL; - config.default_border_width = 2; + config.default_border_width = logical_px(2); + config.default_floating_border_width = logical_px(2); /* Set default_orientation to NO_ORIENTATION for auto orientation. */ config.default_orientation = NO_ORIENTATION; @@ -474,11 +239,14 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, if (config.workspace_urgency_timer == 0) config.workspace_urgency_timer = 0.5; - parse_configuration(override_configpath); + config.focus_wrapping = FOCUS_WRAPPING_ON; + + parse_configuration(override_configpath, true); if (reload) { translate_keysyms(); - grab_all_keys(conn, false); + grab_all_keys(conn); + regrab_all_buttons(conn); } if (config.font.type == FONT_TYPE_NONE) { @@ -493,21 +261,4 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, x_deco_recurse(croot); xcb_flush(conn); } - -#if 0 - /* Set an empty name for every workspace which got no name */ - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->name != NULL) { - /* If the font was not specified when the workspace name - * was loaded, we need to predict the text width now */ - if (ws->text_width == 0) - ws->text_width = predict_text_width(global_conn, - config.font, ws->name, ws->name_len); - continue; - } - - workspace_set_name(ws, NULL); - } -#endif }