aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-10-08 11:26:45 -0400
committerDrew DeVault <sir@cmpwn.com>2017-10-08 11:26:45 -0400
commit6271abd644da15070d29d2d06bc527f89a799375 (patch)
treea6b07648871ac884e5770f070224907973c5ac43
parenteb7b920303f0589fd5220a3d025b9c678d7c7a16 (diff)
downloadsway-6271abd644da15070d29d2d06bc527f89a799375.zip
sway-6271abd644da15070d29d2d06bc527f89a799375.tar.gz
sway-6271abd644da15070d29d2d06bc527f89a799375.tar.bz2
Fix #12910.15-rc1
-rw-r--r--sway/commands/scratchpad.c14
-rw-r--r--sway/criteria.c8
2 files changed, 18 insertions, 4 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index dec32f5..6c5c92d 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -7,10 +7,8 @@
#include "sway/layout.h"
static swayc_t *fetch_view_from_scratchpad() {
- if (sp_index >= scratchpad->length) {
- sp_index = 0;
- }
- swayc_t *view = scratchpad->items[sp_index++];
+ sp_index = (sp_index + 1) % scratchpad->length;
+ swayc_t *view = scratchpad->items[sp_index];
if (wlc_view_get_output(view->handle) != swayc_active_output()->handle) {
wlc_view_set_output(view->handle, swayc_active_output()->handle);
@@ -46,6 +44,14 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
if (strcasecmp(argv[0], "show") == 0 && scratchpad->length > 0) {
if (!sp_view) {
+ if (current_container) {
+ // Haxor the scratchpad index if criteria'd
+ for (int i = 0; i < scratchpad->length; ++i) {
+ if (scratchpad->items[i] == current_container) {
+ sp_index = (i - 1) % scratchpad->length;
+ }
+ }
+ }
sp_view = fetch_view_from_scratchpad();
} else {
if (swayc_active_workspace() != sp_view->parent) {
diff --git a/sway/criteria.c b/sway/criteria.c
index f5fe40c..e8978eb 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -434,10 +434,18 @@ static void container_match_add(swayc_t *container, struct list_tokens *list_tok
list_add(list_tokens->list, container);
}
}
+
list_t *container_for(list_t *tokens) {
struct list_tokens list_tokens = (struct list_tokens){create_list(), tokens};
container_map(&root_container, (void (*)(swayc_t *, void *))container_match_add, &list_tokens);
+
+ for (int i = 0; i < scratchpad->length; ++i) {
+ swayc_t *c = scratchpad->items[i];
+ if (criteria_test(c, tokens)) {
+ list_add(list_tokens.list, c);
+ }
+ }
return list_tokens.list;
}