X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fresize.c;h=f07fcec6a169fb9e478d48d8161a9d3ac3bc2ea0;hb=2592c63603081dd44c7bccf6014b55a253e14003;hp=f6b6da74a644e4f9f27429635e5ce8a27e24dfe2;hpb=b1060ff938c14f2480b23ab40e087a29752236c9;p=i3%2Fi3 diff --git a/src/resize.c b/src/resize.c index f6b6da74..f07fcec6 100644 --- a/src/resize.c +++ b/src/resize.c @@ -1,34 +1,13 @@ /* - * 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-2010 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 -#include - -#include -#include - -#include "i3.h" -#include "data.h" -#include "resize.h" -#include "util.h" -#include "xcb.h" -#include "debug.h" -#include "layout.h" -#include "randr.h" -#include "config.h" -#include "floating.h" -#include "workspace.h" -#include "log.h" +#include "all.h" /* * This is an ugly data structure which we need because there is no standard @@ -38,165 +17,187 @@ * */ struct callback_params { - resize_orientation_t orientation; - Output *screen; - xcb_window_t helpwin; - uint32_t *new_position; + orientation_t orientation; + Con *output; + 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); + 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); } -/* - * Renders the resize window between the first/second container and resizes - * the table column/row. - * - */ -int resize_graphical_handler(xcb_connection_t *conn, Workspace *ws, int first, int second, - resize_orientation_t orientation, xcb_button_press_event_t *event) { - 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; +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; } - /* We cannot use the X root window's width_in_pixels or height_in_pixels - * attributes here since they are not updated when you configure new - * 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 */ - 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); - - DLOG("Screen dimensions: (%d, %d) %d x %d\n", screen->rect.x, screen->rect.y, screen->rect.width, screen->rect.height); - - 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, - most_right->rect.x + most_right->rect.width, - most_bottom->rect.x + most_bottom->rect.height}; - xcb_window_t grabwin = create_window(conn, grabrect, XCB_WINDOW_CLASS_INPUT_ONLY, -1, true, 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 = screen->rect.x; - helprect.y = event->root_y; - helprect.width = screen->rect.width; - 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_H_DOUBLE_ARROW : - XCB_CURSOR_SB_V_DOUBLE_ARROW), true, mask, values); - - xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin); - - xcb_flush(conn); - - struct callback_params params = { orientation, screen, helpwin, &new_position }; - - drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback, ¶ms); - - xcb_destroy_window(conn, helpwin); - xcb_destroy_window(conn, grabwin); - 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; + } + } - int pixels; - if (orientation == O_VERTICAL) - pixels = (new_position - event->root_x); - else pixels = (new_position - event->root_y); - resize_container(conn, ws, first, second, orientation, pixels); + 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; + } - return 1; -} - -/* - * Adjusts the container size factors according to the resizing parameters. - * This is an abstraction used by resize_container. - */ -static void adjust_container_factors(float *factors, int ws_size, int unoccupied_size, - int num_items, int first, int second, int pixels) { - /* Find the current sizes */ - int sizes[num_items]; - for (int i = 0; i < num_items; ++i) - sizes[i] = factors[i] == 0 ? ws_size / num_items : unoccupied_size * factors[i]; - - /* Adjust them */ - sizes[first] += pixels; - sizes[second] -= pixels; - - /* Calculate the new unoccupied size */ - if (factors[first] == 0) unoccupied_size += ws_size / num_items; - if (factors[second] == 0) unoccupied_size += ws_size / num_items; - - /* Calculate the new factors */ - for (int i = 0; i < num_items; ++i) { - if (factors[i] != 0 || i == first || i == second) - factors[i] = (float)sizes[i] / unoccupied_size; - } + return true; } -/* - * Resizes a column/row by the given amount of pixels. Called by - * resize_graphical_handler (the user clicked) or parse_resize_command (the - * user issued the command) - * - */ -void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int second, - resize_orientation_t orientation, int pixels) { - if (orientation == O_VERTICAL) { - adjust_container_factors(ws->width_factor, ws->rect.width, - get_unoccupied_x(ws), ws->cols, first, second, pixels); - } - else { - adjust_container_factors(ws->height_factor, workspace_height(ws), - get_unoccupied_y(ws), ws->rows, first, second, pixels); - } - - render_layout(conn); +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.colorpixel; + + 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, ¶ms); + + 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; }