]> git.sur5r.net Git - i3/i3/blobdiff - src/resize.c
Added missing newlines in log statements.
[i3/i3] / src / resize.c
index 3a639e2ede9587f8fdb4e0c53cd11f3c375c86fc..05fe50558dba737352efc15333b362cf4ce69e20 100644 (file)
+#undef I3__FILE__
+#define I3__FILE__ "resize.c"
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * This file contains the functions for resizing table columns/rows because
- * it’s actually lots of work, compared to the other handlers.
+ * resize.c: Interactive resizing.
  *
  */
-#include <stdlib.h>
-#include <assert.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-
-#include "i3.h"
-#include "data.h"
-#include "resize.h"
-#include "util.h"
-#include "xcb.h"
-#include "debug.h"
-#include "layout.h"
-#include "xinerama.h"
-#include "config.h"
-#include "floating.h"
+#include "all.h"
+
+extern xcb_connection_t *conn;
 
 /*
- * Renders the resize window between the first/second container and resizes
- * the table column/row.
+ * 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).
  *
  */
-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;
-        xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
-        i3Screen *screen = get_screen_containing(event->root_x, event->root_y);
-        if (screen == NULL) {
-                LOG("BUG: No screen found at this position (%d, %d)\n", event->root_x, event->root_y);
-                return 1;
-        }
-
-        LOG("Screen dimensions: (%d, %d) %d x %d\n", screen->rect.x, screen->rect.y, screen->rect.width, screen->rect.height);
+struct callback_params {
+    orientation_t orientation;
+    Con *output;
+    xcb_window_t helpwin;
+    uint32_t *new_position;
+};
+
+DRAGGING_CB(resize_callback) {
+    const struct callback_params *params = extra;
+    Con *output = params->output;
+    DLOG("new x = %d, y = %d\n", new_x, new_y);
+    if (params->orientation == HORIZ) {
+        /* Check if the new coordinates are within screen boundaries */
+        if (new_x > (output->rect.x + output->rect.width - 25) ||
+            new_x < (output->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 > (output->rect.y + output->rect.height - 25) ||
+            new_y < (output->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);
+}
 
-        /* FIXME: horizontal resizing causes empty spaces to exist */
-        if (orientation == O_HORIZONTAL) {
-                LOG("Sorry, horizontal resizing is not yet activated due to creating layout bugs."
-                    "If you are brave, enable the code for yourself and try fixing it.\n");
-                return 1;
+bool resize_find_tiling_participants(Con **current, Con **other, direction_t direction) {
+    DLOG("Find two participants for resizing container=%p in direction=%i\n", other, direction);
+    Con *first = *current;
+    Con *second = NULL;
+    if (first == NULL) {
+        DLOG("Current container is NULL, aborting.\n");
+        return false;
+    }
+
+    /* Go up in the tree and search for a container to resize */
+    const orientation_t search_orientation = ((direction == D_LEFT || direction == D_RIGHT) ? HORIZ : VERT);
+    const bool dir_backwards = (direction == D_UP || direction == D_LEFT);
+    while (first->type != CT_WORKSPACE &&
+           first->type != CT_FLOATING_CON &&
+           second == NULL) {
+        /* get the appropriate first container with the matching
+         * orientation (skip stacked/tabbed cons) */
+        if ((con_orientation(first->parent) != search_orientation) ||
+            (first->parent->layout == L_STACKED) ||
+            (first->parent->layout == L_TABBED)) {
+            first = first->parent;
+            continue;
         }
 
-        uint32_t mask = 0;
-        uint32_t values[2];
-
-        mask = XCB_CW_OVERRIDE_REDIRECT;
-        values[0] = 1;
-
-        /* Open a new window, the resizebar. Grab the pointer and move the window around
-           as the user moves the pointer. */
-        Rect grabrect = {0, 0, root_screen->width_in_pixels, root_screen->height_in_pixels};
-        xcb_window_t grabwin = create_window(conn, grabrect, XCB_WINDOW_CLASS_INPUT_ONLY, -1, mask, values);
-
-        Rect helprect;
-        if (orientation == O_VERTICAL) {
-                helprect.x = event->root_x;
-                helprect.y = screen->rect.y;
-                helprect.width = 2;
-                helprect.height = screen->rect.height;
-                new_position = event->root_x;
+        /* get the counterpart for this resizement */
+        if (dir_backwards) {
+            second = TAILQ_PREV(first, nodes_head, nodes);
         } else {
-                helprect.x = 0;
-                helprect.y = event->root_y;
-                helprect.width = root_screen->width_in_pixels;
-                helprect.height = 2;
-                new_position = event->root_y;
+            second = TAILQ_NEXT(first, nodes);
         }
 
-        mask = XCB_CW_BACK_PIXEL;
-        values[0] = config.client.focused.border;
-
-        mask |= XCB_CW_OVERRIDE_REDIRECT;
-        values[1] = 1;
-
-        xcb_window_t helpwin = create_window(conn, helprect, XCB_WINDOW_CLASS_INPUT_OUTPUT,
-                                             (orientation == O_VERTICAL ?
-                                              XCB_CURSOR_SB_V_DOUBLE_ARROW :
-                                              XCB_CURSOR_SB_H_DOUBLE_ARROW), mask, values);
-
-        xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
-
-        xcb_flush(conn);
-
-        void resize_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) {
-                LOG("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) ||
-                            new_x < screen->rect.x)
-                                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) ||
-                            new_y < screen->rect.y)
-                                return;
-
-                        values[0] = new_position = new_y;
-                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_Y, values);
-                }
-
-                xcb_flush(conn);
+        if (second == NULL) {
+            DLOG("No second container in this direction found, trying to look further up in the tree...\n");
+            first = first->parent;
         }
+    }
 
-        drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback);
-
-        xcb_destroy_window(conn, helpwin);
-        xcb_destroy_window(conn, grabwin);
-        xcb_flush(conn);
-
-        if (orientation == O_VERTICAL) {
-                LOG("Resize was from X = %d to X = %d\n", event->root_x, new_position);
-                if (event->root_x == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
+    DLOG("Found participants: first=%p and second=%p.\n", first, second);
+    *current = first;
+    *other = second;
+    if (first == NULL || second == NULL) {
+        DLOG("Could not find two participants for this resize request.\n");
+        return false;
+    }
 
-                int default_width = ws->rect.width / ws->cols;
-                int old_unoccupied_x = get_unoccupied_x(ws);
-
-                /* We pre-calculate the unoccupied space to see if we need to adapt sizes before
-                 * doing the resize */
-                int new_unoccupied_x = old_unoccupied_x;
-
-                if (old_unoccupied_x == 0)
-                        old_unoccupied_x = ws->rect.width;
-
-                if (ws->width_factor[first] == 0)
-                        new_unoccupied_x += default_width;
-
-                if (ws->width_factor[second] == 0)
-                        new_unoccupied_x += default_width;
-
-                LOG("\n\n\n");
-                LOG("old = %d, new = %d\n", old_unoccupied_x, new_unoccupied_x);
-
-                /* If the space used for customly resized columns has changed we need to adapt the
-                 * other customly resized columns, if any */
-                if (new_unoccupied_x != old_unoccupied_x)
-                        for (int col = 0; col < ws->cols; col++) {
-                                if (ws->width_factor[col] == 0)
-                                        continue;
-
-                                LOG("Updating other column (%d) (current width_factor = %f)\n", col, ws->width_factor[col]);
-                                ws->width_factor[col] = (ws->width_factor[col] * old_unoccupied_x) / new_unoccupied_x;
-                                LOG("to %f\n", ws->width_factor[col]);
-                        }
-
-                LOG("old_unoccupied_x = %d\n", old_unoccupied_x);
-
-                LOG("Updating first (before = %f)\n", ws->width_factor[first]);
-                /* Convert 0 (for default width_factor) to actual numbers */
-                if (ws->width_factor[first] == 0)
-                        ws->width_factor[first] = ((float)ws->rect.width / ws->cols) / new_unoccupied_x;
-
-                LOG("middle = %f\n", ws->width_factor[first]);
-                int old_width = ws->width_factor[first] * old_unoccupied_x;
-                LOG("first->width = %d, new_position = %d, event->root_x = %d\n", old_width, new_position, event->root_x);
-                ws->width_factor[first] *= (float)(old_width + (new_position - event->root_x)) / old_width;
-                LOG("-> %f\n", ws->width_factor[first]);
-
-
-                LOG("Updating second (before = %f)\n", ws->width_factor[second]);
-                if (ws->width_factor[second] == 0)
-                        ws->width_factor[second] = ((float)ws->rect.width / ws->cols) / new_unoccupied_x;
-                LOG("middle = %f\n", ws->width_factor[second]);
-                old_width = ws->width_factor[second] * old_unoccupied_x;
-                LOG("second->width = %d, new_position = %d, event->root_x = %d\n", old_width, new_position, event->root_x);
-                ws->width_factor[second] *= (float)(old_width - (new_position - event->root_x)) / old_width;
-                LOG("-> %f\n", ws->width_factor[second]);
-
-                LOG("new unoccupied_x = %d\n", get_unoccupied_x(ws));
-
-                LOG("\n\n\n");
-        } else {
-#if 0
-                LOG("Resize was from Y = %d to Y = %d\n", event->root_y, new_position);
-                if (event->root_y == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
-
-                /* Convert 0 (for default height_factor) to actual numbers */
-                if (first->height_factor == 0)
-                        first->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-                if (second->height_factor == 0)
-                        second->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-
-                first->height_factor *= (float)(first->height + (new_position - event->root_y)) / first->height;
-                second->height_factor *= (float)(second->height - (new_position - event->root_y)) / second->height;
-#endif
-        }
-
-        render_layout(conn);
+    return true;
+}
 
-        return 1;
+int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, const xcb_button_press_event_t *event) {
+    DLOG("resize handler\n");
+
+    /* TODO: previously, we were getting a rect containing all screens. why? */
+    Con *output = con_get_output(first);
+    DLOG("x = %d, width = %d\n", output->rect.x, output->rect.width);
+
+    x_mask_event_mask(~XCB_EVENT_MASK_ENTER_WINDOW);
+    xcb_flush(conn);
+
+    uint32_t mask = 0;
+    uint32_t values[2];
+
+    mask = XCB_CW_OVERRIDE_REDIRECT;
+    values[0] = 1;
+
+    /* Open a new window, the resizebar. Grab the pointer and move the window around
+       as the user moves the pointer. */
+    xcb_window_t grabwin = create_window(conn, output->rect, XCB_COPY_FROM_PARENT, XCB_COPY_FROM_PARENT,
+                                         XCB_WINDOW_CLASS_INPUT_ONLY, XCURSOR_CURSOR_POINTER, true, mask, values);
+
+    /* Keep track of the coordinate orthogonal to motion so we can determine
+     * the length of the resize afterward. */
+    uint32_t initial_position, new_position;
+
+    /* Configure the resizebar and snap the pointer. The resizebar runs along
+     * the rect of the second con and follows the motion of the pointer. */
+    Rect helprect;
+    if (orientation == HORIZ) {
+        helprect.x = second->rect.x;
+        helprect.y = second->rect.y;
+        helprect.width = logical_px(2);
+        helprect.height = second->rect.height;
+        initial_position = second->rect.x;
+        xcb_warp_pointer(conn, XCB_NONE, event->root, 0, 0, 0, 0,
+                         second->rect.x, event->root_y);
+    } else {
+        helprect.x = second->rect.x;
+        helprect.y = second->rect.y;
+        helprect.width = second->rect.width;
+        helprect.height = logical_px(2);
+        initial_position = second->rect.y;
+        xcb_warp_pointer(conn, XCB_NONE, event->root, 0, 0, 0, 0,
+                         event->root_x, second->rect.y);
+    }
+
+    mask = XCB_CW_BACK_PIXEL;
+    values[0] = config.client.focused.border;
+
+    mask |= XCB_CW_OVERRIDE_REDIRECT;
+    values[1] = 1;
+
+    xcb_window_t helpwin = create_window(conn, helprect, XCB_COPY_FROM_PARENT, XCB_COPY_FROM_PARENT,
+                                         XCB_WINDOW_CLASS_INPUT_OUTPUT, (orientation == HORIZ ? XCURSOR_CURSOR_RESIZE_HORIZONTAL : XCURSOR_CURSOR_RESIZE_VERTICAL), true, mask, values);
+
+    xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
+
+    xcb_flush(conn);
+
+    /* `new_position' will be updated by the `resize_callback'. */
+    new_position = initial_position;
+
+    const struct callback_params params = {orientation, output, helpwin, &new_position};
+
+    /* `drag_pointer' blocks until the drag is completed. */
+    drag_result_t drag_result = drag_pointer(NULL, event, grabwin, BORDER_TOP, 0, resize_callback, &params);
+
+    xcb_destroy_window(conn, helpwin);
+    xcb_destroy_window(conn, grabwin);
+    xcb_flush(conn);
+
+    /* User cancelled the drag so no action should be taken. */
+    if (drag_result == DRAG_REVERT)
+        return 0;
+
+    int pixels = (new_position - initial_position);
+
+    DLOG("Done, pixels = %d\n", pixels);
+
+    // if we got thus far, the containers must have
+    // percentages associated with them
+    assert(first->percent > 0.0);
+    assert(second->percent > 0.0);
+
+    // calculate the new percentage for the first container
+    double new_percent, difference;
+    double percent = first->percent;
+    DLOG("percent = %f\n", percent);
+    int original = (orientation == HORIZ ? first->rect.width : first->rect.height);
+    DLOG("original = %d\n", original);
+    new_percent = (original + pixels) * (percent / original);
+    difference = percent - new_percent;
+    DLOG("difference = %f\n", difference);
+    DLOG("new percent = %f\n", new_percent);
+    first->percent = new_percent;
+
+    // calculate the new percentage for the second container
+    double s_percent = second->percent;
+    second->percent = s_percent + difference;
+    DLOG("second->percent = %f\n", second->percent);
+
+    // now we must make sure that the sum of the percentages remain 1.0
+    con_fix_percent(first->parent);
+
+    return 0;
 }