Merge branch 'tree' into next

[i3/i3] / include / floating.h

diff --git a/include/floating.h b/include/floating.h
index 4f7cf422d95366db7b75c8f9e897358a285ed4c0..6ab4cf2e1621597e191d57f2a8ecff4091ade4f6 100644 (file)
--- a/include/floating.h
+++ b/include/floating.h
@@ -28,9 +28,23 @@ typedef enum { BORDER_LEFT   = (1 << 0),
                BORDER_BOTTOM = (1 << 3)} border_t;
 
 /**
- * Enters floating mode for the given client.  Correctly takes care of the
- * position/size (separately stored for tiling/floating mode) and
- * repositions/resizes/redecorates the client.
+ * Enables floating mode for the given container by detaching it from its
+ * parent, creating a new container around it and storing this container in the
+ * floating_windows list of the workspace.
+ *
+ */
+void floating_enable(Con *con, bool automatic);
+
+/**
+ * Disables floating mode for the given container by re-attaching the container
+ * to its old parent.
+ *
+ */
+void floating_disable(Con *con, bool automatic);
+
+/**
+ * Calls floating_enable() for tiling containers and floating_disable() for
+ * floating containers.
  *
  * If the automatic flag is set to true, this was an automatic update by a
  * change of the window class from the application which can be overwritten by
@@ -39,6 +53,19 @@ typedef enum { BORDER_LEFT   = (1 << 0),
  */
 void toggle_floating_mode(Con *con, bool automatic);
 
+/**
+ * Raises the given container in the list of floating containers
+ *
+ */
+void floating_raise_con(Con *con);
+
+/**
+ * Checks if con’s coordinates are within its workspace and re-assigns it to
+ * the actual workspace if not.
+ *
+ */
+bool floating_maybe_reassign_ws(Con *con);
+
 #if 0
 /**
  * Removes the floating client from its workspace and attaches it to the new
@@ -64,7 +91,6 @@ int floating_border_click(xcb_connection_t *conn, Client *client,
  *
  */
 void floating_drag_window(Con *con, xcb_button_press_event_t *event);
-#if 0
 
 /**
  * Called when the user clicked on a floating window while holding the
@@ -72,9 +98,9 @@ void floating_drag_window(Con *con, xcb_button_press_event_t *event);
  * Calls the drag_pointer function with the resize_window callback
  *
  */
-void floating_resize_window(xcb_connection_t *conn, Client *client,
-                            bool proportional, xcb_button_press_event_t *event);
+void floating_resize_window(Con *con, bool proportional, xcb_button_press_event_t *event);
 
+#if 0
 /**
  * Changes focus in the given direction for floating clients.
  *