Merge i3bar into next

[i3/i3] / include / floating.h

diff --git a/include/floating.h b/include/floating.h
index 6169d7b4057b0c2e5405f50f64b2b160a2d85169..6ab4cf2e1621597e191d57f2a8ecff4091ade4f6 100644 (file)
--- a/include/floating.h
+++ b/include/floating.h
@@ -3,7 +3,7 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
@@ -11,25 +11,62 @@
 #ifndef _FLOATING_H
 #define _FLOATING_H
 
+#include "tree.h"
+
 /** Callback for dragging */
-typedef void(*callback_t)(Rect*, uint32_t, uint32_t);
+typedef void(*callback_t)(Con*, Rect*, uint32_t, uint32_t, void*);
+
+/** Macro to create a callback function for dragging */
+#define DRAGGING_CB(name) \
+        static void name(Con *con, Rect *old_rect, uint32_t new_x, \
+                         uint32_t new_y, void *extra)
 
 /** On which border was the dragging initiated? */
-typedef enum { BORDER_LEFT, BORDER_RIGHT, BORDER_TOP, BORDER_BOTTOM} border_t;
+typedef enum { BORDER_LEFT   = (1 << 0),
+               BORDER_RIGHT  = (1 << 1),
+               BORDER_TOP    = (1 << 2),
+               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
  * the user.
  *
  */
-void toggle_floating_mode(xcb_connection_t *conn, Client *client,
-                          bool automatic);
+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
  * workspace. This is centralized here because it may happen if you move it
@@ -47,14 +84,23 @@ void floating_assign_to_workspace(Client *client, Workspace *new_workspace);
 int floating_border_click(xcb_connection_t *conn, Client *client,
                           xcb_button_press_event_t *event);
 
+#endif
 /**
  * Called when the user clicked on the titlebar of a floating window.
  * Calls the drag_pointer function with the drag_window callback
  *
  */
-void floating_drag_window(xcb_connection_t *conn, Client *client,
-                          xcb_button_press_event_t *event);
+void floating_drag_window(Con *con, xcb_button_press_event_t *event);
+
+/**
+ * Called when the user clicked on a floating window while holding the
+ * floating_modifier and the right mouse button.
+ * Calls the drag_pointer function with the resize_window callback
+ *
+ */
+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.
  *
@@ -79,6 +125,7 @@ void floating_move(xcb_connection_t *conn, Client *currently_focused,
  */
 void floating_toggle_hide(xcb_connection_t *conn, Workspace *workspace);
 
+#endif
 /**
  * This function grabs your pointer and lets you drag stuff around (borders).
  * Every time you move your mouse, an XCB_MOTION_NOTIFY event will be received
@@ -87,7 +134,8 @@ void floating_toggle_hide(xcb_connection_t *conn, Workspace *workspace);
  * the event and the new coordinates (x, y).
  *
  */
-void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event,
-                  xcb_window_t confine_to, border_t border, callback_t callback);
+void drag_pointer(Con *con, xcb_button_press_event_t *event,
+                  xcb_window_t confine_to, border_t border, callback_t callback,
+                  void *extra);
 
 #endif