+#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-2012 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"
*
*/
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);
+ DLOG("Ungrabbing all keys\n");
+ xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
}
/*
* Translates keysymbols to keycodes for all bindings which use keysyms.
*
*/
-void translate_keysyms() {
+void translate_keysyms(void) {
Binding *bind;
xcb_keysym_t keysym;
int col;
}
/*
- * Grab the bound keys (tell X to send us keypress events for those keycodes)
+ * Switches the key bindings to the given mode, if the mode exists
*
*/
-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++);
- }
+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");
}
/*
- * Switches the key bindings to the given mode, if the mode exists
+ * 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 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;
+void update_barconfig() {
+ 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;
+ }
- ungrab_all_keys(conn);
- bindings = mode->bindings;
- translate_keysyms();
- grab_all_keys(conn, false);
- return;
+ char *mode;
+ switch (current->mode) {
+ case M_HIDE:
+ mode ="hide";
+ break;
+ case M_INVISIBLE:
+ mode ="invisible";
+ break;
+ case M_DOCK:
+ default:
+ mode = "dock";
+ break;
}
- ELOG("ERROR: Mode not found\n");
+ /* 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);
+ }
}
/*
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)");
+ SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)");
}
/*
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);
TAILQ_REMOVE(&barconfigs, barconfig, configs);
FREE(barconfig);
}
memset(&config, 0, sizeof(config));
/* Initialize default colors */
-#define INIT_COLOR(x, cborder, cbackground, ctext) \
+#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.default_border = BS_NORMAL;
config.default_floating_border = BS_NORMAL;
+ config.default_border_width = 2;
/* Set default_orientation to NO_ORIENTATION for auto orientation. */
config.default_orientation = NO_ORIENTATION;
+ /* Set default urgency reset delay to 500ms */
+ if (config.workspace_urgency_timer == 0)
+ config.workspace_urgency_timer = 0.5;
+
parse_configuration(override_configpath);
if (reload) {
grab_all_keys(conn, false);
}
- 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);
projects / i3 / i3 / blobdiff