diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-15 15:14:35 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-15 15:14:35 +1000 |
commit | 701fcafc70f18c6f1982a742019e875beeb258d7 (patch) | |
tree | e40d92b53c4fefde865b1d23d3c1bcae8ea54c37 /sway/tree/layout.c | |
parent | Merge pull request #2445 from RyanDwyer/resize-tiling-via-cursor (diff) | |
download | sway-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 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 38e14d00..2b710403 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -20,14 +20,7 @@ | |||
20 | #include "log.h" | 20 | #include "log.h" |
21 | 21 | ||
22 | static int index_child(const struct sway_container *child) { | 22 | static int index_child(const struct sway_container *child) { |
23 | struct sway_container *parent = child->parent; | 23 | return list_find(child->parent->children, child); |
24 | for (int i = 0; i < parent->children->length; ++i) { | ||
25 | if (parent->children->items[i] == child) { | ||
26 | return i; | ||
27 | } | ||
28 | } | ||
29 | // This happens if the child is a floating container | ||
30 | return -1; | ||
31 | } | 24 | } |
32 | 25 | ||
33 | static void container_handle_fullscreen_reparent(struct sway_container *con, | 26 | static void container_handle_fullscreen_reparent(struct sway_container *con, |
@@ -125,11 +118,9 @@ struct sway_container *container_remove_child(struct sway_container *child) { | |||
125 | } | 118 | } |
126 | 119 | ||
127 | struct sway_container *parent = child->parent; | 120 | struct sway_container *parent = child->parent; |
128 | for (int i = 0; i < parent->children->length; ++i) { | 121 | int index = index_child(child); |
129 | if (parent->children->items[i] == child) { | 122 | if (index != -1) { |
130 | list_del(parent->children, i); | 123 | list_del(parent->children, index); |
131 | break; | ||
132 | } | ||
133 | } | 124 | } |
134 | child->parent = NULL; | 125 | child->parent = NULL; |
135 | container_notify_subtree_changed(parent); | 126 | container_notify_subtree_changed(parent); |