move con_focus to con.c

diff --git a/include/con.h b/include/con.h
index 71f73e3d0cf32a68ec5ab8dd5494dbb0a8c3b6a0..8022fc011fd0cba9a266e7553473ddb1288f7767 100644 (file)
--- a/include/con.h
+++ b/include/con.h
@@ -2,6 +2,7 @@
 #define _CON_H
 
 Con *con_new(Con *parent);
+void con_focus(Con *con);
 bool con_is_leaf(Con *con);
 bool con_accepts_window(Con *con);
 Con *con_get_output(Con *con);

diff --git a/include/tree.h b/include/tree.h
index 21c02967744673a7882269e832cbd7f62a3e1b2a..029bbe346b931cfc8813c73ab9321250d787f2c6 100644 (file)
--- a/include/tree.h
+++ b/include/tree.h
@@ -15,7 +15,6 @@ extern struct all_cons_head all_cons;
 void tree_init();
 Con *tree_open_con(Con *con);
 void tree_split(Con *con, orientation_t orientation);
-void con_focus(Con *con);
 void level_up();
 void level_down();
 void tree_render();

diff --git a/src/con.c b/src/con.c
index 5c2204589b2bf6941cf968ba24923eb5d85558cb..d0daba5906b7f58f0fd2510ab17975d419cf7f3e 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -74,6 +74,24 @@ void con_detach(Con *con) {
     }
 }
 
+/*
+ * Sets input focus to the given container. Will be updated in X11 in the next
+ * run of x_push_changes().
+ *
+ */
+void con_focus(Con *con) {
+    assert(con != NULL);
+
+    /* 1: set focused-pointer to the new con */
+    /* 2: exchange the position of the container in focus stack of the parent all the way up */
+    TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+    TAILQ_INSERT_HEAD(&(con->parent->focus_head), con, focused);
+    if (con->parent->parent != NULL)
+        con_focus(con->parent);
+
+    focused = con;
+}
+
 /*
  * Returns true when this node is a leaf node (has no children)
  *

diff --git a/src/tree.c b/src/tree.c
index 22dcf5cc8b29e761e63fbaf1eeabc17f16b2a729..3a6579832cd683283145efbabdf77f93fd341909 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -9,24 +9,6 @@ struct Con *focused;
 
 struct all_cons_head all_cons = TAILQ_HEAD_INITIALIZER(all_cons);
 
-/*
- * Sets input focus to the given container. Will be updated in X11 in the next
- * run of x_push_changes().
- *
- */
-void con_focus(Con *con) {
-    assert(con != NULL);
-
-    /* 1: set focused-pointer to the new con */
-    /* 2: exchange the position of the container in focus stack of the parent all the way up */
-    TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
-    TAILQ_INSERT_HEAD(&(con->parent->focus_head), con, focused);
-    if (con->parent->parent != NULL)
-        con_focus(con->parent);
-
-    focused = con;
-}
-
 /*
  * Loads tree from ~/.i3/_restart.json
  *