Merge branch 'master' into next

[i3/i3] / include / x.h

diff --git a/include/x.h b/include/x.h
index 827f6f855e8eeb94966e44d2dfabe99498470c0f..29a8bec20c87d26b8278937674302ebbeb78605f 100644 (file)
--- a/include/x.h
+++ b/include/x.h
@@ -52,7 +52,7 @@ bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom);
  * Kills the given X11 window using WM_DELETE_WINDOW (if supported).
  *
  */
-void x_window_kill(xcb_window_t window);
+void x_window_kill(xcb_window_t window, kill_window_t kill_window);
 
 /**
  * Draws the decoration of the given container onto its parent.
@@ -60,13 +60,21 @@ void x_window_kill(xcb_window_t window);
  */
 void x_draw_decoration(Con *con);
 
+/**
+ * Recursively calls x_draw_decoration. This cannot be done in x_push_node
+ * because x_push_node uses focus order to recurse (see the comment above)
+ * while drawing the decoration needs to happen in the actual order.
+ *
+ */
+void x_deco_recurse(Con *con);
+
 /**
  * This function pushes the properties of each node of the layout tree to
  * X11 if they have changed (like the map state, position of the window, …).
  * It recursively traverses all children of the given node.
  *
  */
-void x_push_node(Con *con, bool skip_decoration);
+void x_push_node(Con *con);
 
 /**
  * Pushes all changes (state of each node, see x_push_node() and the window
@@ -96,4 +104,11 @@ void x_set_name(Con *con, const char *name);
  */
 void x_set_i3_atoms();
 
+/**
+ * Set warp_to coordinates.  This will trigger on the next call to
+ * x_push_changes().
+ *
+ */
+void x_set_warp_to(Rect *rect);
+
 #endif