From 840ce51bfddb83857aef872238b93ff441ced212 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 14 Sep 2015 09:28:42 +0200 Subject: [PATCH] Extract workspace names from bindings before reordering. fixes #1889 --- include/workspace.h | 11 ++++- src/config_parser.c | 1 + src/workspace.c | 62 ++++++++++++++++++++--------- testcases/t/172-start-on-named-ws.t | 19 +++++++++ 4 files changed, 74 insertions(+), 19 deletions(-) diff --git a/include/workspace.h b/include/workspace.h index 82d18919..21ab18d6 100644 --- a/include/workspace.h +++ b/include/workspace.h @@ -25,7 +25,16 @@ */ Con *workspace_get(const char *num, bool *created); -/* +/** + * Extracts workspace names from keybindings (e.g. “web” from “bindsym $mod+1 + * workspace web”), so that when an output needs a workspace, i3 can start with + * the first configured one. Needs to be called before reorder_bindings() so + * that the config-file order is used, not the i3-internal order. + * + */ +void extract_workspace_names_from_bindings(void); + +/** * Returns a pointer to a new workspace in the given output. The workspace * is created attached to the tree hierarchy through the given content * container. diff --git a/src/config_parser.c b/src/config_parser.c index 04423483..ea00412d 100644 --- a/src/config_parser.c +++ b/src/config_parser.c @@ -996,6 +996,7 @@ bool parse_file(const char *f, bool use_nagbar) { struct ConfigResultIR *config_output = parse_config(new, context); yajl_gen_free(config_output->json_gen); + extract_workspace_names_from_bindings(); check_for_duplicate_bindings(context); reorder_bindings(); diff --git a/src/workspace.c b/src/workspace.c index 04053e90..61b68515 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -17,6 +17,10 @@ * back-and-forth switching. */ static char *previous_workspace_name = NULL; +/* NULL-terminated list of workspace names (in order) extracted from + * keybindings. */ +static char **binding_workspace_names = NULL; + /* * Sets ws->layout to splith/splitv if default_orientation was specified in the * configfile. Otherwise, it uses splith/splitv depending on whether the output @@ -107,21 +111,21 @@ Con *workspace_get(const char *num, bool *created) { } /* - * Returns a pointer to a new workspace in the given output. The workspace - * is created attached to the tree hierarchy through the given content - * container. + * Extracts workspace names from keybindings (e.g. “web” from “bindsym $mod+1 + * workspace web”), so that when an output needs a workspace, i3 can start with + * the first configured one. Needs to be called before reorder_bindings() so + * that the config-file order is used, not the i3-internal order. * */ -Con *create_workspace_on_output(Output *output, Con *content) { - /* add a workspace to this output */ - Con *out, *current; - char *name; - bool exists = true; - Con *ws = con_new(NULL, NULL); - ws->type = CT_WORKSPACE; - - /* try the configured workspace bindings first to find a free name */ +void extract_workspace_names_from_bindings(void) { Binding *bind; + int n = 0; + if (binding_workspace_names != NULL) { + for (int i = 0; binding_workspace_names[i] != NULL; i++) { + free(binding_workspace_names[i]); + } + FREE(binding_workspace_names); + } TAILQ_FOREACH(bind, bindings, bindings) { DLOG("binding with command %s\n", bind->command); if (strlen(bind->command) < strlen("workspace ") || @@ -152,17 +156,39 @@ Con *create_workspace_on_output(Output *output, Con *content) { free(target_name); continue; } - FREE(ws->name); - ws->name = target_name; - DLOG("trying name *%s*\n", ws->name); + DLOG("Saving workspace name \"%s\"\n", target_name); + binding_workspace_names = srealloc(binding_workspace_names, ++n * sizeof(char*)); + binding_workspace_names[n-1] = target_name; + } + binding_workspace_names = srealloc(binding_workspace_names, ++n * sizeof(char*)); + binding_workspace_names[n-1] = NULL; +} + +/* + * Returns a pointer to a new workspace in the given output. The workspace + * is created attached to the tree hierarchy through the given content + * container. + * + */ +Con *create_workspace_on_output(Output *output, Con *content) { + /* add a workspace to this output */ + Con *out, *current; + char *name; + bool exists = true; + Con *ws = con_new(NULL, NULL); + ws->type = CT_WORKSPACE; + + /* try the configured workspace bindings first to find a free name */ + for (int n = 0; binding_workspace_names[n] != NULL; n++) { + char *target_name = binding_workspace_names[n]; /* Ensure that this workspace is not assigned to a different output — * otherwise we would create it, then move it over to its output, then * find a new workspace, etc… */ bool assigned = false; struct Workspace_Assignment *assignment; TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { - if (strcmp(assignment->name, ws->name) != 0 || + if (strcmp(assignment->name, target_name) != 0 || strcmp(assignment->output, output->name) == 0) continue; @@ -175,10 +201,10 @@ Con *create_workspace_on_output(Output *output, Con *content) { current = NULL; TAILQ_FOREACH(out, &(croot->nodes_head), nodes) - GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name)); - + GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, target_name)); exists = (current != NULL); if (!exists) { + ws->name = sstrdup(target_name); /* Set ->num to the number of the workspace, if the name actually * is a number or starts with a number */ ws->num = ws_name_to_number(ws->name); diff --git a/testcases/t/172-start-on-named-ws.t b/testcases/t/172-start-on-named-ws.t index 8b00abac..757a75b4 100644 --- a/testcases/t/172-start-on-named-ws.t +++ b/testcases/t/172-start-on-named-ws.t @@ -106,4 +106,23 @@ is_deeply(\@names, [ '3' ], 'i3 starts on workspace 3 without ;exec foo'); exit_gracefully($pid); +################################################################################ +# 6: verify internal binding reordering does not affect startup workspace +################################################################################ + +$config = <