aboutsummaryrefslogtreecommitdiffstats
path: root/include/list.h
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-15 15:14:35 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-15 15:14:35 +1000
commit701fcafc70f18c6f1982a742019e875beeb258d7 (patch)
treee40d92b53c4fefde865b1d23d3c1bcae8ea54c37 /include/list.h
parentMerge pull request #2445 from RyanDwyer/resize-tiling-via-cursor (diff)
downloadsway-701fcafc70f18c6f1982a742019e875beeb258d7.tar.gz
sway-701fcafc70f18c6f1982a742019e875beeb258d7.tar.zst
sway-701fcafc70f18c6f1982a742019e875beeb258d7.zip
Use list_find in more places and refactor/fix workspace prev_next functions
The original purpose of this commit is to replace some for loops with list_find. But while doing this I found the workspace_prev_next_impl functions to be difficult to read and also contained a bug, so I refactored them and fixed the bug. To reproduce the bug: * Have two outputs, where the left output has workspaces 1, 2, 3 and the right output has workspaces 4, 5, 6. Make workspace 2 focused_inactive and workspace 4 focused. * Run `workspace prev`. * Previously it would visit the left output, then apply `workspace prev` to workspace 2, which focuses workspace 1. * Now it will focus the rightmost workspace on the left output (workspace 3). The refactoring I made to the workspace functions are: * Added the static keyword. * They now accept an int dir rather than bool, to avoid an unnecessary conversion. * Rather than preparing start and end variables for the purpose of iterating, just iterate everything. * Replace for loops with list_find. * Don't call workspace_output_prev_next_impl (this fixes the bug).
Diffstat (limited to 'include/list.h')
-rw-r--r--include/list.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/list.h b/include/list.h
index 7c0e4bd2..03851a82 100644
--- a/include/list.h
+++ b/include/list.h
@@ -20,7 +20,7 @@ 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.
22int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); 22int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to);
23int list_find(list_t *list, void *item); 23int list_find(list_t *list, const void *item);
24// stable sort since qsort is not guaranteed to be stable 24// stable sort since qsort is not guaranteed to be stable
25void list_stable_sort(list_t *list, int compare(const void *a, const void *b)); 25void list_stable_sort(list_t *list, int compare(const void *a, const void *b));
26// swap two elements in a list 26// swap two elements in a list