Merge branch 'master' into next

[i3/i3] / include / tree.h

diff --git a/include/tree.h b/include/tree.h
index b483434fcdaad90891cbdf09d8fd5a4f8f34ade7..b3c2a515131eef95ef964ab94ffce7a3057ee803 100644 (file)
--- a/include/tree.h
+++ b/include/tree.h
@@ -1,9 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * tree.c: Everything that primarily modifies the layout tree data structure.
+ *
  */
-
-#ifndef _TREE_H
-#define _TREE_H
+#pragma once
 
 extern Con *croot;
 /* TODO: i am not sure yet how much access to the focused container should
@@ -34,23 +38,23 @@ Con *tree_open_con(Con *con, i3Window *window);
 void tree_split(Con *con, orientation_t orientation);
 
 /**
- * Moves focus one level up.
+ * Moves focus one level up. Returns true if focus changed.
  *
  */
-void level_up();
+bool level_up(void);
 
 /**
- * Moves focus one level down.
+ * Moves focus one level down. Returns true if focus changed.
  *
  */
-void level_down();
+bool level_down(void);
 
 /**
  * Renders the tree, that is rendering all outputs using render_con() and
  * pushing the changes to X11 using x_push_changes().
  *
  */
-void tree_render();
+void tree_render(void);
 
 /**
  * Closes the current container using tree_close().
@@ -100,5 +104,3 @@ bool tree_restore(const char *path, xcb_get_geometry_reply_t *geometry);
  *
  */
 void tree_flatten(Con *child);
-
-#endif