diff options
author | 2015-11-22 09:18:20 -0500 | |
---|---|---|
committer | 2015-11-22 09:18:20 -0500 | |
commit | 7bd82a26b00f2ad57563bee55a098f97c52421f3 (patch) | |
tree | 793b93d9df55478856a9d6dda7d99d3f8bd7d0e7 /include | |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | include/list.h | 3 | ||||
-rw-r--r-- | include/stringop.h | 3 |
3 files changed, 8 insertions, 0 deletions
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); |