diff options
author | 2016-06-03 00:19:26 +0200 | |
---|---|---|
committer | 2016-06-03 00:19:26 +0200 | |
commit | 431013db724d26590a6d0f87b6afbf8e3fa08208 (patch) | |
tree | 634c9197d6dd1dfebbb124d797f5c13b1c605a92 /include | |
parent | Fix output command when varible not set (diff) | |
parent | Merge pull request #692 from zandrmartin/inplace-merge-sort (diff) | |
download | sway-431013db724d26590a6d0f87b6afbf8e3fa08208.tar.gz sway-431013db724d26590a6d0f87b6afbf8e3fa08208.tar.zst sway-431013db724d26590a6d0f87b6afbf8e3fa08208.zip |
Merge branch 'master' of https://github.com/SirCmpwn/sway into variables_corner_cases
Diffstat (limited to 'include')
-rw-r--r-- | include/list.h | 3 | ||||
-rw-r--r-- | include/output.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/list.h b/include/list.h index b2e26f95..f478b6bb 100644 --- a/include/list.h +++ b/include/list.h | |||
@@ -20,5 +20,6 @@ void list_qsort(list_t *list, int compare(const void *left, const void *right)); | |||
20 | // Return index for first item in list that returns 0 for given compare | 20 | // Return index for first item in list that returns 0 for given compare |
21 | // function or -1 if none matches. | 21 | // function or -1 if none matches. |
22 | int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); | 22 | int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); |
23 | 23 | // stable sort since qsort is not guaranteed to be stable | |
24 | void list_stable_sort(list_t *list, int compare(const void *a, const void *b)); | ||
24 | #endif | 25 | #endif |
diff --git a/include/output.h b/include/output.h index 12bc478f..10c5bb53 100644 --- a/include/output.h +++ b/include/output.h | |||
@@ -16,7 +16,7 @@ void get_absolute_position(swayc_t *container, struct wlc_point *point); | |||
16 | // given wlc_point. | 16 | // given wlc_point. |
17 | void get_absolute_center_position(swayc_t *container, struct wlc_point *point); | 17 | void get_absolute_center_position(swayc_t *container, struct wlc_point *point); |
18 | 18 | ||
19 | int sort_workspace_cmp_qsort(const void *a, const void *b); | 19 | // stable sort workspaces on this output |
20 | void sort_workspaces(swayc_t *output); | 20 | void sort_workspaces(swayc_t *output); |
21 | 21 | ||
22 | #endif | 22 | #endif |