X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Ffloating.h;h=c8586527a02cec97898a222138459cac32159469;hb=6241419c86602a999a4766c24edb7b884395e433;hp=d368048bcf6750ff5ce0528cc11e68ec8f34d48a;hpb=0f5256dc72728f61054a18d1f47224d393cc95af;p=i3%2Fi3

diff --git a/include/floating.h b/include/floating.h
index d368048b..c8586527 100644
--- a/include/floating.h
+++ b/include/floating.h
@@ -1,24 +1,24 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * floating.c: Floating windows.
  *
  */
-#ifndef _FLOATING_H
-#define _FLOATING_H
+#ifndef I3_FLOATING_H
+#define I3_FLOATING_H
+
+#include "tree.h"
 
 /** Callback for dragging */
-typedef void(*callback_t)(xcb_connection_t*, Client*, Rect*, uint32_t, uint32_t, void*);
+typedef void(*callback_t)(Con*, Rect*, uint32_t, uint32_t, const void*);
 
 /** Macro to create a callback function for dragging */
 #define DRAGGING_CB(name) \
-        static void name(xcb_connection_t *conn, Client *client, \
-                         Rect *old_rect, uint32_t new_x, uint32_t new_y, \
-                         void *extra)
+        static void name(Con *con, Rect *old_rect, uint32_t new_x, \
+                         uint32_t new_y, const void *extra)
 
 /** On which border was the dragging initiated? */
 typedef enum { BORDER_LEFT   = (1 << 0),
@@ -27,18 +27,45 @@ 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
  * 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
@@ -56,13 +83,13 @@ 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, const xcb_button_press_event_t *event);
 
 /**
  * Called when the user clicked on a floating window while holding the
@@ -70,9 +97,17 @@ void floating_drag_window(xcb_connection_t *conn, Client *client,
  * Calls the drag_pointer function with the resize_window callback
  *
  */
-void floating_resize_window(xcb_connection_t *conn, Client *client,
-                            xcb_button_press_event_t *event);
+void floating_resize_window(Con *con, const bool proportional, const xcb_button_press_event_t *event);
+
+/**
+ * Called when a floating window is created or resized.
+ * This function resizes the window if its size is higher or lower than the
+ * configured maximum/minimum size, respectively.
+ *
+ */
+void floating_check_size(Con *floating_con);
 
+#if 0
 /**
  * Changes focus in the given direction for floating clients.
  *
@@ -97,6 +132,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
@@ -105,8 +141,24 @@ 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 *extra);
+void drag_pointer(Con *con, const xcb_button_press_event_t *event,
+                  xcb_window_t confine_to, border_t border, int cursor,
+                  callback_t callback, const void *extra);
+
+/**
+ * Repositions the CT_FLOATING_CON to have the coordinates specified by
+ * newrect, but only if the coordinates are not out-of-bounds. Also reassigns
+ * the floating con to a different workspace if this move was across different
+ * outputs.
+ *
+ */
+void floating_reposition(Con *con, Rect newrect);
+
+/**
+ * Fixes the coordinates of the floating window whenever the window gets
+ * reassigned to a different output (or when the output’s rect changes).
+ *
+ */
+void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect);
 
 #endif