diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-22 09:18:20 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-22 09:18:20 -0500 |
commit | 7bd82a26b00f2ad57563bee55a098f97c52421f3 (patch) | |
tree | 793b93d9df55478856a9d6dda7d99d3f8bd7d0e7 | |
parent | Update header for default config (diff) | |
parent | cmd_workspace: Don't fill up config->workspace_outputs with duplicates. (diff) | |
download | sway-7bd82a26b00f2ad57563bee55a098f97c52421f3.tar.gz sway-7bd82a26b00f2ad57563bee55a098f97c52421f3.tar.zst sway-7bd82a26b00f2ad57563bee55a098f97c52421f3.zip |
Merge pull request #245 from sce/workspace_output_duplicates
Fix `workspace_output` duplicates
-rw-r--r-- | common/list.c | 10 | ||||
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | include/list.h | 3 | ||||
-rw-r--r-- | include/stringop.h | 3 | ||||
-rw-r--r-- | sway/commands.c | 8 | ||||
-rw-r--r-- | sway/config.c | 8 | ||||
-rw-r--r-- | sway/stringop.c | 13 |
7 files changed, 46 insertions, 1 deletions
diff --git a/common/list.c b/common/list.c index 45efc16f..310296d8 100644 --- a/common/list.c +++ b/common/list.c | |||
@@ -53,3 +53,13 @@ void list_cat(list_t *list, list_t *source) { | |||
53 | void list_sort(list_t *list, int compare(const void *left, const void *right)) { | 53 | 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 | |||
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++) { | ||
59 | void *item = list->items[i]; | ||
60 | if (compare(item, data) == 0) { | ||
61 | return i; | ||
62 | } | ||
63 | } | ||
64 | return -1; | ||
65 | } | ||
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/include/list.h b/include/list.h index aff6800f..90d0ad36 100644 --- a/include/list.h +++ b/include/list.h | |||
@@ -15,5 +15,8 @@ void list_del(list_t *list, int index); | |||
15 | void list_cat(list_t *list, list_t *source); | 15 | void list_cat(list_t *list, list_t *source); |
16 | // See qsort | 16 | // See qsort |
17 | void list_sort(list_t *list, int compare(const void *left, const void *right)); | 17 | void list_sort(list_t *list, int compare(const void *left, const void *right)); |
18 | // Return index for first item in list that returns 0 for given compare | ||
19 | // function or -1 if none matches. | ||
20 | int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); | ||
18 | 21 | ||
19 | #endif | 22 | #endif |
diff --git a/include/stringop.h b/include/stringop.h index febbbaba..bb681bcd 100644 --- a/include/stringop.h +++ b/include/stringop.h | |||
@@ -14,6 +14,9 @@ char *strip_whitespace(char *str); | |||
14 | char *strip_comments(char *str); | 14 | char *strip_comments(char *str); |
15 | void strip_quotes(char *str); | 15 | void strip_quotes(char *str); |
16 | 16 | ||
17 | // strcmp that also handles null pointers. | ||
18 | int lenient_strcmp(char *a, char *b); | ||
19 | |||
17 | // Simply split a string with delims, free with `free_flat_list` | 20 | // Simply split a string with delims, free with `free_flat_list` |
18 | list_t *split_string(const char *str, const char *delims); | 21 | list_t *split_string(const char *str, const char *delims); |
19 | void free_flat_list(list_t *list); | 22 | void free_flat_list(list_t *list); |
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 | } | ||
diff --git a/sway/stringop.c b/sway/stringop.c index 8d6cac2f..fe5a97ca 100644 --- a/sway/stringop.c +++ b/sway/stringop.c | |||
@@ -74,6 +74,19 @@ void strip_quotes(char *str) { | |||
74 | *end = '\0'; | 74 | *end = '\0'; |
75 | } | 75 | } |
76 | 76 | ||
77 | // strcmp that also handles null pointers. | ||
78 | int lenient_strcmp(char *a, char *b) { | ||
79 | if (a == b) { | ||
80 | return 0; | ||
81 | } else if (!a) { | ||
82 | return -1; | ||
83 | } else if (!b) { | ||
84 | return 1; | ||
85 | } else { | ||
86 | return strcmp(a, b); | ||
87 | } | ||
88 | } | ||
89 | |||
77 | list_t *split_string(const char *str, const char *delims) { | 90 | list_t *split_string(const char *str, const char *delims) { |
78 | list_t *res = create_list(); | 91 | list_t *res = create_list(); |
79 | char *copy = strdup(str); | 92 | char *copy = strdup(str); |