* i3 - an improved dynamic tiling window manager
* © 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"
}
static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint32_t keycode) {
- DLOG("Grabbing %d\n", keycode);
+ DLOG("Grabbing %d with modifiers %d (with mod_mask_lock %d)\n", keycode, bind->mods, bind->mods | XCB_MOD_MASK_LOCK);
/* Grab the key in all combinations */
#define GRAB_KEY(modifier) \
do { \
}
GRAB_KEY(mods);
GRAB_KEY(mods | xcb_numlock_mask);
+ GRAB_KEY(mods | XCB_MOD_MASK_LOCK);
GRAB_KEY(mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
}
* or NULL if no such binding exists.
*
*/
-Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) {
+Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode) {
Binding *bind;
+ if (!key_release) {
+ /* On a KeyPress event, we first reset all
+ * B_UPON_KEYRELEASE_IGNORE_MODS bindings back to B_UPON_KEYRELEASE */
+ TAILQ_FOREACH(bind, bindings, bindings) {
+ if (bind->release == B_UPON_KEYRELEASE_IGNORE_MODS)
+ bind->release = B_UPON_KEYRELEASE;
+ }
+ }
+
TAILQ_FOREACH(bind, bindings, bindings) {
- /* First compare the modifiers */
- if (bind->mods != modifiers)
+ /* First compare the modifiers (unless this is a
+ * B_UPON_KEYRELEASE_IGNORE_MODS binding and this is a KeyRelease
+ * event) */
+ if (bind->mods != modifiers &&
+ (bind->release != B_UPON_KEYRELEASE_IGNORE_MODS ||
+ !key_release))
continue;
/* If a symbol was specified by the user, we need to look in
if (bind->symbol != NULL) {
if (memmem(bind->translated_to,
bind->number_keycodes * sizeof(xcb_keycode_t),
- &keycode, sizeof(xcb_keycode_t)) != NULL)
- break;
+ &keycode, sizeof(xcb_keycode_t)) == NULL)
+ continue;
} else {
/* This case is easier: The user specified a keycode */
- if (bind->keycode == keycode)
- break;
+ if (bind->keycode != keycode)
+ continue;
}
+
+ /* If this keybinding is a KeyRelease binding, it matches the key which
+ * the user pressed. We therefore mark it as
+ * B_UPON_KEYRELEASE_IGNORE_MODS for later, so that the user can
+ * release the modifiers before the actual key and the KeyRelease will
+ * still be matched. */
+ if (bind->release == B_UPON_KEYRELEASE && !key_release)
+ bind->release = B_UPON_KEYRELEASE_IGNORE_MODS;
+
+ /* Check if the binding is for a KeyPress or a KeyRelease event */
+ if ((bind->release == B_UPON_KEYPRESS && key_release) ||
+ (bind->release >= B_UPON_KEYRELEASE && !key_release))
+ continue;
+
+ break;
}
return (bind == TAILQ_END(bindings) ? NULL : bind);
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");
}
+/*
+ * 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 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;
+ }
+
+ char *mode;
+ switch (current->mode) {
+ case M_HIDE:
+ mode ="hide";
+ break;
+ case M_INVISIBLE:
+ mode ="invisible";
+ break;
+ case M_DOCK:
+ default:
+ mode = "dock";
+ break;
+ }
+
+ /* 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);
+ }
+}
+
/*
* Get the path of the first configuration file found. If override_configpath
* is specified, that path is returned and saved for further calls. Otherwise,
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");
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) {