X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Ffloating.h;h=a7813099c3283117265364a62dc6f23284ee5754;hb=d3e954befd5b8d8befc8b8cdfdfc398f9babce99;hp=43600187f60d5e4db3e386a93f7d84e5415e0bde;hpb=9ee26a608e329ceea583950fcc92bc5a28f6cf55;p=i3%2Fi3

diff --git a/include/floating.h b/include/floating.h
index 43600187..a7813099 100644
--- a/include/floating.h
+++ b/include/floating.h
@@ -2,29 +2,30 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * floating.c: Floating windows.
  *
  */
-#ifndef I3_FLOATING_H
-#define I3_FLOATING_H
+#pragma once
+
+#include <config.h>
 
 #include "tree.h"
 
 /** Callback for dragging */
-typedef void(*callback_t)(Con*, Rect*, uint32_t, uint32_t, const 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(Con *con, Rect *old_rect, uint32_t new_x, \
-                         uint32_t new_y, const void *extra)
+#define DRAGGING_CB(name)                                      \
+    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),
-               BORDER_RIGHT  = (1 << 1),
-               BORDER_TOP    = (1 << 2),
-               BORDER_BOTTOM = (1 << 3)} border_t;
+typedef enum { BORDER_LEFT = (1 << 0),
+               BORDER_RIGHT = (1 << 1),
+               BORDER_TOP = (1 << 2),
+               BORDER_BOTTOM = (1 << 3) } border_t;
 
 /**
  * Enables floating mode for the given container by detaching it from its
@@ -65,25 +66,18 @@ void floating_raise_con(Con *con);
  */
 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
- * via keyboard and if you move it using your mouse.
+ * Centers a floating con above the specified rect.
  *
  */
-void floating_assign_to_workspace(Client *client, Workspace *new_workspace);
+void floating_center(Con *con, Rect rect);
 
 /**
- * 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.
+ * Moves the given floating con to the current pointer position.
  *
  */
-int floating_border_click(xcb_connection_t *conn, Client *client,
-                          xcb_button_press_event_t *event);
+void floating_move_to_pointer(Con *con);
 
-#endif
 /**
  * Called when the user clicked on the titlebar of a floating window.
  * Calls the drag_pointer function with the drag_window callback
@@ -100,39 +94,18 @@ void floating_drag_window(Con *con, const 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.
- *
- * Changing to the left/right means going to the previous/next floating client,
- * changing to top/bottom means cycling through the Z-index.
- *
- */
-void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused,
-                              direction_t direction);
-
-/**
- * Moves the client 10px to the specified direction.
+ * 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 or when adjustments are needed to conform to the
+ * configured size increments or aspect ratio limits.
  *
- */
-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
- * the specified workspace.
+ * When prefer_height is true and the window needs to be resized because of the
+ * configured aspect ratio, the width is adjusted first, preserving the previous
+ * height.
  *
  */
-void floating_toggle_hide(xcb_connection_t *conn, Workspace *workspace);
+void floating_check_size(Con *floating_con, bool prefer_height);
 
-#endif
 /**
  * This is the return value of a drag operation like drag_pointer.
  *
@@ -165,8 +138,8 @@ typedef enum {
  *
  */
 drag_result_t 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);
+                           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
@@ -175,7 +148,16 @@ drag_result_t drag_pointer(Con *con, const xcb_button_press_event_t *event,
  * outputs.
  *
  */
-void floating_reposition(Con *con, Rect newrect);
+bool floating_reposition(Con *con, Rect newrect);
+
+/**
+ * Sets size of the CT_FLOATING_CON to specified dimensions. Might limit the
+ * actual size with regard to size constraints taken from user settings.
+ * Additionally, the dimensions may be upscaled until they're divisible by the
+ * window's size hints.
+ *
+ */
+void floating_resize(Con *floating_con, uint32_t x, uint32_t y);
 
 /**
  * Fixes the coordinates of the floating window whenever the window gets
@@ -183,5 +165,3 @@ void floating_reposition(Con *con, Rect newrect);
  *
  */
 void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect);
-
-#endif