X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig.c;h=0dc59365289d548c6c64c3164f7e383faa65c09d;hb=5dbfb05c85f592fb90a3918cd50c21e30009cbb2;hp=2d7fb3bf6e4d12aa0f1d848c94fd0a62dc0c95b9;hpb=5c2088c87e0e30947a670094534b838dc2831c94;p=i3%2Fi3 diff --git a/src/config.c b/src/config.c index 2d7fb3bf..0dc59365 100644 --- a/src/config.c +++ b/src/config.c @@ -1,17 +1,17 @@ +#undef I3__FILE__ +#define I3__FILE__ "config.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * - * config.c: Configuration file (calling the parser (src/cfgparse.y) with the - * correct path, switching key bindings mode). + * config.c: Configuration file (calling the parser (src/config_parser.c) with + * the correct path, switching key bindings mode). * */ #include "all.h" - -/* We need Xlib for XStringToKeysym */ -#include +#include char *current_configpath = NULL; Config config; @@ -24,212 +24,19 @@ struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs); * */ void ungrab_all_keys(xcb_connection_t *conn) { - DLOG("Ungrabbing all keys\n"); - 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\n", keycode); - /* 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_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, xcb_keycode_t keycode) { - Binding *bind; - - TAILQ_FOREACH(bind, bindings, bindings) { - /* First compare the modifiers */ - if (bind->mods != modifiers) - 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) - break; - } else { - /* This case is easier: The user specified a keycode */ - if (bind->keycode == keycode) - break; - } - } - - return (bind == TAILQ_END(bindings) ? NULL : bind); -} - -/* - * Translates keysymbols to keycodes for all bindings which use keysyms. - * - */ -void translate_keysyms() { - Binding *bind; - TAILQ_FOREACH(bind, bindings, bindings) { - if (bind->keycode > 0) - continue; - - /* We need to translate the symbol to a keycode */ - xcb_keysym_t keysym = XStringToKeysym(bind->symbol); - if (keysym == NoSymbol) { - ELOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol); - continue; - } - - uint32_t last_keycode = 0; - xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); - if (keycodes == NULL) { - DLOG("Could not translate symbol \"%s\"\n", bind->symbol); - continue; - } - - bind->number_keycodes = 0; - - for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) { - /* We hope duplicate keycodes will be returned in order - * and skip them */ - if (last_keycode == *walk) - continue; - last_keycode = *walk; - bind->number_keycodes++; - } - DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, bind->number_keycodes); - bind->translated_to = smalloc(bind->number_keycodes * sizeof(xcb_keycode_t)); - memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t)); - free(keycodes); - } + DLOG("Ungrabbing all keys\n"); + xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY); } /* - * Grab the bound keys (tell X to send us keypress events for those keycodes) + * Sends the current bar configuration as an event to all barconfig_update listeners. * */ -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); - return; - } - - ELOG("ERROR: Mode not found\n"); -} - -/* - * 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, ":"); +void update_barconfig() { + Barconfig *current; + TAILQ_FOREACH(current, &barconfigs, configs) { + ipc_send_barconfig_update_event(current); } - 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)"); } /* @@ -238,12 +45,24 @@ static char *get_config_path(const char *override_configpath) { * parse_file(). * */ -static void parse_configuration(const char *override_configpath) { - char *path = get_config_path(override_configpath); - DLOG("Parsing configfile %s\n", path); +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); } /* @@ -266,9 +85,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, while (!TAILQ_EMPTY(bindings)) { bind = TAILQ_FIRST(bindings); TAILQ_REMOVE(bindings, bind, bindings); - FREE(bind->translated_to); - FREE(bind->command); - FREE(bind); + binding_free(bind); } FREE(bindings); SLIST_REMOVE(&modes, mode, Mode, modes); @@ -279,8 +96,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)); @@ -299,81 +114,122 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, 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.focused_workspace_text); + FREE(barconfig->colors.focused_workspace_border); FREE(barconfig->colors.focused_workspace_bg); - FREE(barconfig->colors.active_workspace_text); + FREE(barconfig->colors.focused_workspace_text); + FREE(barconfig->colors.active_workspace_border); FREE(barconfig->colors.active_workspace_bg); - FREE(barconfig->colors.inactive_workspace_text); + FREE(barconfig->colors.active_workspace_text); + FREE(barconfig->colors.inactive_workspace_border); FREE(barconfig->colors.inactive_workspace_bg); - FREE(barconfig->colors.urgent_workspace_text); + FREE(barconfig->colors.inactive_workspace_text); + 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 */ +/* 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); + + /* Get rid of the current font */ + free_font(); } 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 */ -#define INIT_COLOR(x, cborder, cbackground, ctext) \ - do { \ - x.border = get_colorpixel(cborder); \ - x.background = get_colorpixel(cbackground); \ - x.text = get_colorpixel(ctext); \ +/* 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); \ } while (0) config.client.background = get_colorpixel("#000000"); - INIT_COLOR(config.client.focused, "#4c7899", "#285577", "#ffffff"); - INIT_COLOR(config.client.focused_inactive, "#333333", "#5f676a", "#ffffff"); - INIT_COLOR(config.client.unfocused, "#333333", "#222222", "#888888"); - INIT_COLOR(config.client.urgent, "#2f343a", "#900000", "#ffffff"); - INIT_COLOR(config.bar.focused, "#4c7899", "#285577", "#ffffff"); - INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888"); - INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff"); + 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"); + INIT_COLOR(config.client.urgent, "#2f343a", "#900000", "#ffffff", "#900000"); + + /* border and indicator color are ignored for placeholder contents */ + INIT_COLOR(config.client.placeholder, "#000000", "#0c0c0c", "#ffffff", "#000000"); + + /* the last argument (indicator color) is ignored for bar colors */ + INIT_COLOR(config.bar.focused, "#4c7899", "#285577", "#ffffff", "#000000"); + 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); + config.default_floating_border_width = logical_px(2); /* Set default_orientation to NO_ORIENTATION for auto orientation. */ config.default_orientation = NO_ORIENTATION; - parse_configuration(override_configpath); + /* Set default urgency reset delay to 500ms */ + if (config.workspace_urgency_timer == 0) + config.workspace_urgency_timer = 0.5; + + /* Set default zero displays exit delay to 500ms */ + if (config.zero_disp_exit_timer_ms == 0) + config.zero_disp_exit_timer_ms = 500; + + parse_configuration(override_configpath, true); if (reload) { translate_keysyms(); - grab_all_keys(conn, false); + grab_all_keys(conn); } - if (config.font.id == 0) { + if (config.font.type == FONT_TYPE_NONE) { ELOG("You did not specify required configuration option \"font\"\n"); config.font = load_font("fixed", true); set_font(&config.font); } + /* Redraw the currently visible decorations on reload, so that + * the possibly new drawing parameters changed. */ + if (reload) { + x_deco_recurse(croot); + xcb_flush(conn); + } + #if 0 /* Set an empty name for every workspace which got no name */ Workspace *ws;