first step of the big refactoring ("tree" branch).

[i3/i3] / include / floating.h

diff --git a/include/floating.h b/include/floating.h
index edc11a95b77bb04e2170e07a6c6136635646598b..4f7cf422d95366db7b75c8f9e897358a285ed4c0 100644 (file)
--- a/include/floating.h
+++ b/include/floating.h
@@ -3,7 +3,7 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * (c) 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
@@ -11,31 +11,69 @@
 #ifndef _FLOATING_H
 #define _FLOATING_H
 
+#include "tree.h"
+
+/** Callback for dragging */
+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   = (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.
+ * 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.
  *
- * 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.
+ * 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);
 
+#if 0
 /**
- * Called whenever the user clicks on a border (not the titlebar!) of a floating window.
- * Determines on which border the user clicked and launches the drag_pointer function
- * with the resize_callback.
+ * 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
+ * via keyboard and if you move it using your mouse.
  *
  */
-int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event);
+void floating_assign_to_workspace(Client *client, Workspace *new_workspace);
 
+/**
+ * Called whenever the user clicks on a border (not the titlebar!) of a
+ * floating window. Determines on which border the user clicked and launches
+ * the drag_pointer function with the resize_callback.
+ *
+ */
+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);
+#if 0
+
+/**
+ * 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(xcb_connection_t *conn, Client *client,
+                            bool proportional, xcb_button_press_event_t *event);
 
 /**
  * Changes focus in the given direction for floating clients.
@@ -44,13 +82,15 @@ void floating_drag_window(xcb_connection_t *conn, Client *client, xcb_button_pre
  * changing to top/bottom means cycling through the Z-index.
  *
  */
-void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, direction_t direction);
+void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused,
+                              direction_t direction);
 
 /**
  * Moves the client 10px to the specified direction.
  *
  */
-void floating_move(xcb_connection_t *conn, Client *currently_focused, direction_t direction);
+void floating_move(xcb_connection_t *conn, Client *currently_focused,
+                   direction_t direction);
 
 /**
  * Hides all floating clients (or show them if they are currently hidden) on
@@ -60,3 +100,16 @@ void floating_move(xcb_connection_t *conn, Client *currently_focused, direction_
 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
+ * and the given callback will be called with the parameters specified (client,
+ * border on which the click originally was), the original rect of the client,
+ * the event and the new coordinates (x, y).
+ *
+ */
+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