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
* mapping_notify event or a configuration file reload
*
* Sends the current bar configuration as an event to all barconfig_update listeners.
*
*/
-void update_barconfig() {
+void update_barconfig(void) {
Barconfig *current;
TAILQ_FOREACH(current, &barconfigs, configs) {
ipc_send_barconfig_update_event(current);
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)");
+ "$XDG_CONFIG_HOME/i3/config, ~/.i3/config, $XDG_CONFIG_DIRS/i3/config "
+ "and " SYSCONFDIR "/i3/config)");
}
LOG("Parsing configfile %s\n", path);
FREE(mode);
}
- struct Assignment *assign;
while (!TAILQ_EMPTY(&assignments)) {
- assign = TAILQ_FIRST(&assignments);
- if (assign->type == A_TO_WORKSPACE)
+ struct Assignment *assign = TAILQ_FIRST(&assignments);
+ if (assign->type == A_TO_WORKSPACE || assign->type == A_TO_WORKSPACE_NUMBER)
FREE(assign->dest.workspace);
else if (assign->type == A_COMMAND)
FREE(assign->dest.command);
FREE(assign);
}
+ while (!TAILQ_EMPTY(&ws_assignments)) {
+ struct Workspace_Assignment *assign = TAILQ_FIRST(&ws_assignments);
+ FREE(assign->name);
+ FREE(assign->output);
+ TAILQ_REMOVE(&ws_assignments, assign, ws_assignments);
+ FREE(assign);
+ }
+
/* Clear bar configs */
Barconfig *barconfig;
while (!TAILQ_EMPTY(&barconfigs)) {
bindings = default_mode->bindings;
-#define REQUIRED_OPTION(name) \
- 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));