Merge pull request #4 from taiyu-len/master

fixed focus_parent, moved into move_focus() function
swaywm · Aug 10, 2015 · f9ae9ab · f9ae9ab
2 parents 113fb70 + f923c4e
commit f9ae9ab
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/sway/commands.c b/sway/commands.c
@@ -112,12 +112,7 @@ int cmd_focus(struct sway_config *config, int argc, char **argv) {
 	} else if (strcasecmp(argv[0], "down") == 0) {
 		return move_focus(MOVE_DOWN);
 	} else if (strcasecmp(argv[0], "parent") == 0) {
-		swayc_t *current = get_focused_container(&root_container);
-		if (current && current->parent) {
-			current->parent->focused = NULL;
-			unfocus_all(current->parent);
-			focus_view(current->parent);
-		}
+		return move_focus(MOVE_PARENT);
 	}
 	return 0;
 }

diff --git a/sway/movement.c b/sway/movement.c
@@ -9,6 +9,20 @@ int move_focus(enum movement_direction direction) {
 	swayc_t *current = get_focused_container(&root_container);
 	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) {
 		sway_log(L_DEBUG, "Moving focus away from %p", current);
 

diff --git a/sway/movement.h b/sway/movement.h
@@ -4,11 +4,12 @@
 #include <wlc/wlc.h>
 #include "list.h"
 
-enum movement_direction{
-    MOVE_LEFT,
-    MOVE_RIGHT,
-    MOVE_UP,
-    MOVE_DOWN
+enum movement_direction {
+	MOVE_LEFT,
+	MOVE_RIGHT,
+	MOVE_UP,
+	MOVE_DOWN,
+	MOVE_PARENT
 };
 
 int move_focus(enum movement_direction direction);