X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig.c;h=47a701d2aef2c6c16a2f0e70f9be89165b88d890;hb=4412ccbe5a4fad8a4cd594e6f10f937515a4d37c;hp=b3a204420fa18d463be5716638b24c10f8f9283d;hpb=aa65b507ad107053a0d11989080dbc94b0f63d17;p=i3%2Fi3 diff --git a/src/config.c b/src/config.c index b3a20442..47a701d2 100644 --- a/src/config.c +++ b/src/config.c @@ -2,25 +2,21 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) * - * © 2009-2010 Michael Stapelberg and contributors - * - * See file LICENSE for license information. - * - * src/config.c: Contains all functions handling the configuration file (calling - * the parser (src/cfgparse.y) with the correct path, switching key bindings - * mode). + * config.c: Configuration file (calling the parser (src/cfgparse.y) with the + * correct path, switching key bindings mode). * */ +#include "all.h" /* We need Xlib for XStringToKeysym */ #include -#include "all.h" - char *current_configpath = 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 @@ -86,40 +82,48 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) { * */ 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; + 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; + } - 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); + /* 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); + } } /* @@ -200,8 +204,7 @@ static char *get_config_path(const char *override_configpath) { xdg_config_home = "~/.config"; xdg_config_home = resolve_tilde(xdg_config_home); - if (asprintf(&config_path, "%s/i3/config", xdg_config_home) == -1) - die("asprintf() failed"); + sasprintf(&config_path, "%s/i3/config", xdg_config_home); free(xdg_config_home); if (path_exists(config_path)) @@ -221,8 +224,7 @@ static char *get_config_path(const char *override_configpath) { char *tok = strtok(buf, ":"); while (tok != NULL) { tok = resolve_tilde(tok); - if (asprintf(&config_path, "%s/i3/config", tok) == -1) - die("asprintf() failed"); + sasprintf(&config_path, "%s/i3/config", tok); free(tok); if (path_exists(config_path)) { free(buf); @@ -257,112 +259,159 @@ static void parse_configuration(const char *override_configpath) { * */ void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) { - if (reload) { - /* First ungrab the keys */ - ungrab_all_keys(conn); + if (reload) { + /* 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); - } - FREE(bindings); - SLIST_REMOVE(&modes, mode, Mode, modes); - } + 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); + } + FREE(bindings); + SLIST_REMOVE(&modes, mode, Mode, modes); + } -#if 0 - struct Assignment *assign; - while (!TAILQ_EMPTY(&assignments)) { - assign = TAILQ_FIRST(&assignments); - FREE(assign->windowclass_title); - TAILQ_REMOVE(&assignments, assign, assignments); - FREE(assign); - } -#endif + struct Assignment *assign; + while (!TAILQ_EMPTY(&assignments)) { + 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)); + TAILQ_REMOVE(&assignments, assign, assignments); + FREE(assign); + } - /* Clear workspace names */ + /* Clear bar configs */ + Barconfig *barconfig; + while (!TAILQ_EMPTY(&barconfigs)) { + barconfig = TAILQ_FIRST(&barconfigs); + FREE(barconfig->id); + for (int c = 0; c < barconfig->num_outputs; c++) + free(barconfig->outputs[c]); + 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.focused_workspace_text); + FREE(barconfig->colors.focused_workspace_bg); + FREE(barconfig->colors.active_workspace_text); + FREE(barconfig->colors.active_workspace_bg); + FREE(barconfig->colors.inactive_workspace_text); + FREE(barconfig->colors.inactive_workspace_bg); + FREE(barconfig->colors.urgent_workspace_text); + FREE(barconfig->colors.urgent_workspace_bg); + TAILQ_REMOVE(&barconfigs, barconfig, configs); + FREE(barconfig); + } + + /* Clear workspace names */ #if 0 - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) - workspace_set_name(ws, NULL); + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) + workspace_set_name(ws, NULL); #endif - } - SLIST_INIT(&modes); + /* 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)); - default_mode->name = sstrdup("default"); - default_mode->bindings = scalloc(sizeof(struct bindings_head)); - TAILQ_INIT(default_mode->bindings); - SLIST_INSERT_HEAD(&modes, default_mode, modes); + struct Mode *default_mode = scalloc(sizeof(struct Mode)); + default_mode->name = sstrdup("default"); + default_mode->bindings = scalloc(sizeof(struct bindings_head)); + TAILQ_INIT(default_mode->bindings); + SLIST_INSERT_HEAD(&modes, default_mode, modes); - bindings = default_mode->bindings; + bindings = default_mode->bindings; #define REQUIRED_OPTION(name) \ - if (config.name == NULL) \ - die("You did not specify required configuration option " #name "\n"); + 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)); + /* 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) \ - do { \ - x.border = get_colorpixel(cborder); \ - x.background = get_colorpixel(cbackground); \ - x.text = get_colorpixel(ctext); \ - } 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"); - - config.default_border = BS_NORMAL; - config.default_floating_border = BS_NORMAL; - /* Set default_orientation to NO_ORIENTATION for auto orientation. */ - config.default_orientation = NO_ORIENTATION; - - parse_configuration(override_configpath); - - if (reload) { - translate_keysyms(); - grab_all_keys(conn, false); - } + do { \ + x.border = get_colorpixel(cborder); \ + x.background = get_colorpixel(cbackground); \ + x.text = get_colorpixel(ctext); \ + } 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"); + + config.default_border = BS_NORMAL; + config.default_floating_border = BS_NORMAL; + /* Set default_orientation to NO_ORIENTATION for auto orientation. */ + config.default_orientation = NO_ORIENTATION; + + parse_configuration(override_configpath); + + if (reload) { + translate_keysyms(); + grab_all_keys(conn, false); + } - if (config.font.id == 0) { - ELOG("You did not specify required configuration option \"font\"\n"); - config.font = load_font("fixed", true); - } + if (config.font.id == 0) { + ELOG("You did not specify required configuration option \"font\"\n"); + config.font = load_font("fixed", true); + set_font(&config.font); + } -#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; - } + /* Redraw the currently visible decorations on reload, so that + * the possibly new drawing parameters changed. */ + if (reload) { + x_deco_recurse(croot); + xcb_flush(conn); + } - workspace_set_name(ws, NULL); - } +#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 }