diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-08 11:26:45 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-10-08 11:26:45 -0400 |
commit | 6271abd644da15070d29d2d06bc527f89a799375 (patch) | |
tree | a6b07648871ac884e5770f070224907973c5ac43 /sway/commands | |
parent | Document new criteria (diff) | |
download | sway-6271abd644da15070d29d2d06bc527f89a799375.tar.gz sway-6271abd644da15070d29d2d06bc527f89a799375.tar.zst sway-6271abd644da15070d29d2d06bc527f89a799375.zip |
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/scratchpad.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c index dec32f51..6c5c92df 100644 --- a/sway/commands/scratchpad.c +++ b/sway/commands/scratchpad.c | |||
@@ -7,10 +7,8 @@ | |||
7 | #include "sway/layout.h" | 7 | #include "sway/layout.h" |
8 | 8 | ||
9 | static swayc_t *fetch_view_from_scratchpad() { | 9 | static swayc_t *fetch_view_from_scratchpad() { |
10 | if (sp_index >= scratchpad->length) { | 10 | sp_index = (sp_index + 1) % scratchpad->length; |
11 | sp_index = 0; | 11 | swayc_t *view = scratchpad->items[sp_index]; |
12 | } | ||
13 | swayc_t *view = scratchpad->items[sp_index++]; | ||
14 | 12 | ||
15 | if (wlc_view_get_output(view->handle) != swayc_active_output()->handle) { | 13 | if (wlc_view_get_output(view->handle) != swayc_active_output()->handle) { |
16 | wlc_view_set_output(view->handle, swayc_active_output()->handle); | 14 | wlc_view_set_output(view->handle, swayc_active_output()->handle); |
@@ -46,6 +44,14 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) { | |||
46 | 44 | ||
47 | if (strcasecmp(argv[0], "show") == 0 && scratchpad->length > 0) { | 45 | if (strcasecmp(argv[0], "show") == 0 && scratchpad->length > 0) { |
48 | if (!sp_view) { | 46 | if (!sp_view) { |
47 | if (current_container) { | ||
48 | // Haxor the scratchpad index if criteria'd | ||
49 | for (int i = 0; i < scratchpad->length; ++i) { | ||
50 | if (scratchpad->items[i] == current_container) { | ||
51 | sp_index = (i - 1) % scratchpad->length; | ||
52 | } | ||
53 | } | ||
54 | } | ||
49 | sp_view = fetch_view_from_scratchpad(); | 55 | sp_view = fetch_view_from_scratchpad(); |
50 | } else { | 56 | } else { |
51 | if (swayc_active_workspace() != sp_view->parent) { | 57 | if (swayc_active_workspace() != sp_view->parent) { |