aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/focus.c
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2018-04-02 13:23:43 -0400
committerLibravatar Tony Crisci <tony@dubstepdish.com>2018-04-02 13:23:43 -0400
commit5e024278a62e6fb00a0521240244c428d2382984 (patch)
treed9010d33d4d576297cc5e40d41bed4bb7bf5631a /sway/commands/focus.c
parentdont copy input config (diff)
parentMerge pull request #1697 from RedSoxFan/back-and-forth (diff)
downloadsway-5e024278a62e6fb00a0521240244c428d2382984.tar.gz
sway-5e024278a62e6fb00a0521240244c428d2382984.tar.zst
sway-5e024278a62e6fb00a0521240244c428d2382984.zip
Merge branch 'wlroots' into seat-fixes
Diffstat (limited to 'sway/commands/focus.c')
-rw-r--r--sway/commands/focus.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 4fb732dd..74d9d535 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -20,10 +20,6 @@ static bool parse_movement_direction(const char *name,
20 *out = MOVE_PARENT; 20 *out = MOVE_PARENT;
21 } else if (strcasecmp(name, "child") == 0) { 21 } else if (strcasecmp(name, "child") == 0) {
22 *out = MOVE_CHILD; 22 *out = MOVE_CHILD;
23 } else if (strcasecmp(name, "next") == 0) {
24 *out = MOVE_NEXT;
25 } else if (strcasecmp(name, "prev") == 0) {
26 *out = MOVE_PREV;
27 } else { 23 } else {
28 return false; 24 return false;
29 } 25 }
@@ -51,7 +47,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
51 "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'"); 47 "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
52 } 48 }
53 49
54 struct sway_container *next_focus = container_get_in_direction(con, seat, direction); 50 struct sway_container *next_focus = container_get_in_direction(
51 con, seat, direction);
55 if (next_focus) { 52 if (next_focus) {
56 seat_set_focus(seat, next_focus); 53 seat_set_focus(seat, next_focus);
57 } 54 }