mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1291

Browse Source
This commit is contained in:
Drew DeVault 2017-10-08 11:26:45 -04:00
parent eb7b920303
commit 6271abd644
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sway/commands/scratchpad.c
View File

@ -7,10 +7,8 @@
#include "sway/layout.h" #include "sway/layout.h"
static swayc_t *fetch_view_from_scratchpad() { static swayc_t *fetch_view_from_scratchpad() {
if (sp_index >= scratchpad->length) { sp_index = (sp_index + 1) % scratchpad->length;
sp_index = 0; swayc_t *view = scratchpad->items[sp_index];
}
swayc_t *view = scratchpad->items[sp_index++];
if (wlc_view_get_output(view->handle) != swayc_active_output()->handle) { if (wlc_view_get_output(view->handle) != swayc_active_output()->handle) {
wlc_view_set_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 (strcasecmp(argv[0], "show") == 0 && scratchpad->length > 0) {
if (!sp_view) { 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(); sp_view = fetch_view_from_scratchpad();
} else { } else {
if (swayc_active_workspace() != sp_view->parent) { if (swayc_active_workspace() != sp_view->parent) {

8
sway/criteria.c
View File

@ -434,10 +434,18 @@ static void container_match_add(swayc_t *container, struct list_tokens *list_tok
list_add(list_tokens->list, container); list_add(list_tokens->list, container);
} }
} }
list_t *container_for(list_t *tokens) { list_t *container_for(list_t *tokens) {
struct list_tokens list_tokens = (struct list_tokens){create_list(), 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); 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; return list_tokens.list;
} }