Merge branch 'next'

[i3/i3] / src / resize.c

diff --git a/src/resize.c b/src/resize.c
index db1ac073499afb57f183b82aa19ac27894da3ab3..d48dbdbb90284b80ca141281231d95058f53393b 100644 (file)
--- a/src/resize.c
+++ b/src/resize.c
@@ -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.
  *
@@ -24,12 +24,50 @@
 #include "xcb.h"
 #include "debug.h"
 #include "layout.h"
-#include "xinerama.h"
+#include "randr.h"
 #include "config.h"
 #include "floating.h"
 #include "workspace.h"
 #include "log.h"
 
+/*
+ * This is an ugly data structure which we need because there is no standard
+ * way of having nested functions (only available as a gcc extension at the
+ * moment, clang doesn’t support it) or blocks (only available as a clang
+ * extension and only on Mac OS X systems at the moment).
+ *
+ */
+struct callback_params {
+        resize_orientation_t orientation;
+        Output *screen;
+        xcb_window_t helpwin;
+        uint32_t *new_position;
+};
+
+DRAGGING_CB(resize_callback) {
+        struct callback_params *params = extra;
+        Output *screen = params->screen;
+        DLOG("new x = %d, y = %d\n", new_x, new_y);
+        if (params->orientation == O_VERTICAL) {
+                /* Check if the new coordinates are within screen boundaries */
+                if (new_x > (screen->rect.x + screen->rect.width - 25) ||
+                    new_x < (screen->rect.x + 25))
+                        return;
+
+                *(params->new_position) = new_x;
+                xcb_configure_window(conn, params->helpwin, XCB_CONFIG_WINDOW_X, params->new_position);
+        } else {
+                if (new_y > (screen->rect.y + screen->rect.height - 25) ||
+                    new_y < (screen->rect.y + 25))
+                        return;
+
+                *(params->new_position) = new_y;
+                xcb_configure_window(conn, params->helpwin, XCB_CONFIG_WINDOW_Y, params->new_position);
+        }
+
+        xcb_flush(conn);
+}
+
 /*
  * Renders the resize window between the first/second container and resizes
  * the table column/row.
@@ -37,8 +75,8 @@
  */
 int resize_graphical_handler(xcb_connection_t *conn, Workspace *ws, int first, int second,
                              resize_orientation_t orientation, xcb_button_press_event_t *event) {
-        int new_position;
-        i3Screen *screen = get_screen_containing(event->root_x, event->root_y);
+        uint32_t new_position;
+        Output *screen = get_output_containing(event->root_x, event->root_y);
         if (screen == NULL) {
                 ELOG("BUG: No screen found at this position (%d, %d)\n", event->root_x, event->root_y);
                 return 1;
@@ -49,8 +87,8 @@ int resize_graphical_handler(xcb_connection_t *conn, Workspace *ws, int first, i
          * screens during runtime. Instead, we just use the most right and most
          * bottom Xinerama screen and use their position + width/height to get
          * the area of pixels currently in use */
-        i3Screen *most_right = get_screen_most(D_RIGHT, screen),
-                 *most_bottom = get_screen_most(D_DOWN, screen);
+        Output *most_right = get_output_most(D_RIGHT, screen),
+               *most_bottom = get_output_most(D_DOWN, screen);
 
         DLOG("event->event_x = %d, event->root_x = %d\n", event->event_x, event->root_x);
 
@@ -100,29 +138,9 @@ int resize_graphical_handler(xcb_connection_t *conn, Workspace *ws, int first, i
 
         xcb_flush(conn);
 
-        void resize_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) {
-                DLOG("new x = %d, y = %d\n", new_x, new_y);
-                if (orientation == O_VERTICAL) {
-                        /* Check if the new coordinates are within screen boundaries */
-                        if (new_x > (screen->rect.x + screen->rect.width - 25) ||
-                            new_x < (screen->rect.x + 25))
-                                return;
-
-                        values[0] = new_position = new_x;
-                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_X, values);
-                } else {
-                        if (new_y > (screen->rect.y + screen->rect.height - 25) ||
-                            new_y < (screen->rect.y + 25))
-                                return;
-
-                        values[0] = new_position = new_y;
-                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_Y, values);
-                }
-
-                xcb_flush(conn);
-        }
+        struct callback_params params = { orientation, screen, helpwin, &new_position };
 
-        drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback);
+        drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback, &params);
 
         xcb_destroy_window(conn, helpwin);
         xcb_destroy_window(conn, grabwin);
@@ -249,6 +267,7 @@ void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int seco
                 DLOG("old_unoccupied_y = %d\n", old_unoccupied_y);
 
                 DLOG("Updating first (before = %f)\n", ws->height_factor[first]);
+
                 /* Convert 0 (for default width_factor) to actual numbers */
                 if (ws->height_factor[first] == 0)
                         old_height = (old_unoccupied_y / max(cols_without_hf, 1));