X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=src%2Fconfig.c;h=9631b2160237732ed404ad02757ab064b8d87b9b;hp=833ea6b638d5bb9be23e14525fb999e2b31a65c6;hb=HEAD;hpb=984658e4bef5abb6bdd56c26ca5f3c0f5a97a0a6 diff --git a/src/config.c b/src/config.c index 833ea6b6..9631b216 100644 --- a/src/config.c +++ b/src/config.c @@ -1,5 +1,3 @@ -#undef I3__FILE__ -#define I3__FILE__ "config.c" /* * vim:ts=4:sw=4:expandtab * @@ -11,14 +9,16 @@ * */ #include "all.h" + #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 * @@ -32,7 +32,7 @@ void ungrab_all_keys(xcb_connection_t *conn) { * Sends the current bar configuration as an event to all barconfig_update listeners. * */ -void update_barconfig() { +void update_barconfig(void) { Barconfig *current; TAILQ_FOREACH(current, &barconfigs, configs) { ipc_send_barconfig_update_event(current); @@ -49,7 +49,8 @@ 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 " - "~/.i3/config, $XDG_CONFIG_HOME/i3/config, " SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)"); + "$XDG_CONFIG_HOME/i3/config, ~/.i3/config, $XDG_CONFIG_DIRS/i3/config " + "and " SYSCONFDIR "/i3/config)"); } LOG("Parsing configfile %s\n", path); @@ -71,6 +72,11 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) { */ 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); @@ -91,18 +97,27 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, 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_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)) { @@ -155,20 +170,23 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, 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) - FREE(con->deco_render_params); + 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); @@ -181,10 +199,6 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, 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)); @@ -195,6 +209,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, 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 = draw_util_hex_to_color("#000000"); @@ -224,6 +239,8 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, if (config.workspace_urgency_timer == 0) config.workspace_urgency_timer = 0.5; + config.focus_wrapping = FOCUS_WRAPPING_ON; + parse_configuration(override_configpath, true); if (reload) { @@ -244,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 }