X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig.c;h=24c7b541e447e4f80ab2b676c4d3f0b140bdff6c;hb=50edf495aa3971bfb67471c3aaf2eb72e7abd443;hp=99901e06b3fd2d5c2e179eba56b5d9b136da39ca;hpb=89dd868e82013b94d4dc782dfe73998fe7135214;p=i3%2Fi3 diff --git a/src/config.c b/src/config.c index 99901e06..24c7b541 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,10 +10,10 @@ */ #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); @@ -41,86 +39,30 @@ void update_barconfig() { } } -/* - * 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 " + "~/.i3/config, $XDG_CONFIG_HOME/i3/config, " SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/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); } /* @@ -129,26 +71,29 @@ 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; @@ -156,8 +101,6 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, assign = TAILQ_FIRST(&assignments); if (assign->type == A_TO_WORKSPACE) 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); match_free(&(assign->match)); @@ -172,14 +115,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); @@ -192,53 +153,54 @@ 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) - FREE(con->deco_render_params); + 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) \ + 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"); @@ -252,6 +214,8 @@ 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 = logical_px(2); @@ -263,11 +227,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) { @@ -282,21 +249,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 }