mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4 from taiyu-len/master

Browse source 
fixed focus_parent, moved into move_focus() function
This commit is contained in:
Drew DeVault 2015-08-10 10:18:04 -04:00
commit f9ae9ab6e3
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/commands.c
View file

@ -112,12 +112,7 @@ int cmd_focus(struct sway_config *config, int argc, char **argv) {
} else if (strcasecmp(argv[0], "down") == 0) { } else if (strcasecmp(argv[0], "down") == 0) {
return move_focus(MOVE_DOWN); return move_focus(MOVE_DOWN);
} else if (strcasecmp(argv[0], "parent") == 0) { } else if (strcasecmp(argv[0], "parent") == 0) {
swayc_t *current = get_focused_container(&root_container); return move_focus(MOVE_PARENT);
if (current && current->parent) {
current->parent->focused = NULL;
unfocus_all(current->parent);
focus_view(current->parent);
}
} }
return 0; return 0;
} }

14
sway/movement.c
View file

@ -9,6 +9,20 @@ int move_focus(enum movement_direction direction) {
swayc_t *current = get_focused_container(&root_container); swayc_t *current = get_focused_container(&root_container);
swayc_t *parent = current->parent; swayc_t *parent = current->parent;
if (direction == MOVE_PARENT) {
current = parent;
parent = parent->parent;
if (parent->type == C_ROOT) {
sway_log(L_DEBUG, "Focus cannot move to parent");
return 1;
} else {
sway_log(L_DEBUG, "Moving focus away from %p", current);
unfocus_all(parent);
focus_view(parent);
return 0;
}
}
while (true) { while (true) {
sway_log(L_DEBUG, "Moving focus away from %p", current); sway_log(L_DEBUG, "Moving focus away from %p", current);

3
sway/movement.h
View file

@ -8,7 +8,8 @@ enum movement_direction{
MOVE_LEFT, MOVE_LEFT,
MOVE_RIGHT, MOVE_RIGHT,
MOVE_UP, MOVE_UP,
MOVE_DOWN MOVE_DOWN,
MOVE_PARENT
}; };
int move_focus(enum movement_direction direction); int move_focus(enum movement_direction direction);