Merge branch 'master' into next

[i3/i3] / include / manage.h

diff --git a/include/manage.h b/include/manage.h
index 10beeb525c523b61724d9309cd3311543a569962..e23eccf36a9960f19712061e4471911754ff9f7b 100644 (file)
--- a/include/manage.h
+++ b/include/manage.h
@@ -8,7 +8,6 @@
  * See file LICENSE for license information.
  *
  */
-#include <xcb/xcb.h>
 
 #include "data.h"
 
@@ -20,18 +19,27 @@
  * manage them
  *
  */
-void manage_existing_windows(xcb_connection_t *conn, xcb_property_handlers_t
-                             *prophs, xcb_window_t root);
+void manage_existing_windows(xcb_window_t root);
+
+/**
+ * Restores the geometry of each window by reparenting it to the root window
+ * at the position of its frame.
+ *
+ * This is to be called *only* before exiting/restarting i3 because of evil
+ * side-effects which are to be expected when continuing to run i3.
+ *
+ */
+void restore_geometry();
 
 /**
  * Do some sanity checks and then reparent the window.
  *
  */
-void manage_window(xcb_property_handlers_t *prophs, xcb_connection_t *conn,
-                   xcb_window_t window,
+void manage_window(xcb_window_t window,
                    xcb_get_window_attributes_cookie_t cookie,
                    bool needs_to_be_mapped);
 
+#if 0
 /**
  * reparent_window() gets called when a new window was opened and becomes a
  * child of the root window, or it gets called by us when we manage the
@@ -42,6 +50,8 @@ void manage_window(xcb_property_handlers_t *prophs, xcb_connection_t *conn,
  */
 void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                      xcb_visualid_t visual, xcb_window_t root, uint8_t depth,
-                     int16_t x, int16_t y, uint16_t width, uint16_t height);
+                     int16_t x, int16_t y, uint16_t width, uint16_t height,
+                     uint32_t border_width);
 
 #endif
+#endif