From b8cba33c013e580e6e793ec67a5442407d94a002 Mon Sep 17 00:00:00 2001 From: Taiyu Date: Fri, 14 Aug 2015 12:42:19 -0700 Subject: changed swayc related functions, cleaned up some functions, moved wlc related things into handlers --- sway/movement.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sway/movement.c') diff --git a/sway/movement.c b/sway/movement.c index 166e6508..de987679 100644 --- a/sway/movement.c +++ b/sway/movement.c @@ -10,14 +10,12 @@ bool move_focus(enum movement_direction direction) { swayc_t *parent = current->parent; if (direction == MOVE_PARENT) { - current = parent; - parent = parent->parent; - if (parent->type == C_ROOT) { + if (parent->type == C_OUTPUT) { sway_log(L_DEBUG, "Focus cannot move to parent"); return false; } else { - sway_log(L_DEBUG, "Moving focus away from %p", current); - unfocus_all(parent); + sway_log(L_DEBUG, "Moving focus away from %p to %p", current, parent); + unfocus_all(parent->parent); focus_view(parent); return true; } -- cgit v1.2.3