diff options
-rw-r--r-- | common/list.c | 4 | ||||
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | sway/commands.c | 8 | ||||
-rw-r--r-- | sway/config.c | 8 |
4 files changed, 19 insertions, 3 deletions
diff --git a/common/list.c b/common/list.c index ef1cfda8..310296d8 100644 --- a/common/list.c +++ b/common/list.c | |||
@@ -54,10 +54,10 @@ void list_sort(list_t *list, int compare(const void *left, const void *right)) { | |||
54 | qsort(list->items, list->length, sizeof(void *), compare); | 54 | qsort(list->items, list->length, sizeof(void *), compare); |
55 | } | 55 | } |
56 | 56 | ||
57 | int list_seq_find(list_t *list, int (*cmp)(const void *item, const void *data), const void *data) { | 57 | int list_seq_find(list_t *list, int compare(const void *item, const void *data), const void *data) { |
58 | for (int i = 0; i < list->length; i++) { | 58 | for (int i = 0; i < list->length; i++) { |
59 | void *item = list->items[i]; | 59 | void *item = list->items[i]; |
60 | if ((cmp)(item, data) == 0) { | 60 | if (compare(item, data) == 0) { |
61 | return i; | 61 | return i; |
62 | } | 62 | } |
63 | } | 63 | } |
diff --git a/include/config.h b/include/config.h index c93f9caf..82aa71bf 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -102,6 +102,8 @@ char *do_var_replacement(char *str); | |||
102 | void apply_output_config(struct output_config *oc, swayc_t *output); | 102 | void apply_output_config(struct output_config *oc, swayc_t *output); |
103 | void free_output_config(struct output_config *oc); | 103 | void free_output_config(struct output_config *oc); |
104 | 104 | ||
105 | int workspace_output_cmp_workspace(const void *a, const void *b); | ||
106 | |||
105 | /** | 107 | /** |
106 | * Global config singleton. | 108 | * Global config singleton. |
107 | */ | 109 | */ |
diff --git a/sway/commands.c b/sway/commands.c index 173f0f53..7f24f5ab 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1318,9 +1318,15 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
1318 | return error; | 1318 | return error; |
1319 | } | 1319 | } |
1320 | struct workspace_output *wso = calloc(1, sizeof(struct workspace_output)); | 1320 | struct workspace_output *wso = calloc(1, sizeof(struct workspace_output)); |
1321 | sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); | ||
1322 | wso->workspace = strdup(argv[0]); | 1321 | wso->workspace = strdup(argv[0]); |
1323 | wso->output = strdup(argv[2]); | 1322 | wso->output = strdup(argv[2]); |
1323 | int i = -1; | ||
1324 | if ((i = list_seq_find(config->workspace_outputs, workspace_output_cmp_workspace, wso)) != -1) { | ||
1325 | struct workspace_output *old = config->workspace_outputs->items[i]; | ||
1326 | free(old); // workspaces can only be assigned to a single output | ||
1327 | list_del(config->workspace_outputs, i); | ||
1328 | } | ||
1329 | sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); | ||
1324 | list_add(config->workspace_outputs, wso); | 1330 | list_add(config->workspace_outputs, wso); |
1325 | if (!config->reading) { | 1331 | if (!config->reading) { |
1326 | // TODO: Move workspace to output. (dont do so when reloading) | 1332 | // TODO: Move workspace to output. (dont do so when reloading) |
diff --git a/sway/config.c b/sway/config.c index 725dedd2..2fceb6e2 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -375,3 +375,11 @@ char *do_var_replacement(char *str) { | |||
375 | } | 375 | } |
376 | return str; | 376 | return str; |
377 | } | 377 | } |
378 | |||
379 | // the naming is intentional (albeit long): a workspace_output_cmp function | ||
380 | // would compare two structs in full, while this method only compares the | ||
381 | // workspace. | ||
382 | int workspace_output_cmp_workspace(const void *a, const void *b) { | ||
383 | const struct workspace_output *wsa = a, *wsb = b; | ||
384 | return lenient_strcmp(wsa->workspace, wsb->workspace); | ||
385 | } | ||