X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fresize.c;h=994fd69262fc205ab6b081cfe7efd8b33b691e33;hb=38ab59f17b02e1114e8bcad39d91ed63ced88a32;hp=61c4ada7e9c1e5329285edc3ad17e1f72527f625;hpb=cacc199a6837868a67c4f546df5bd32972d6cc5c;p=i3%2Fi3 diff --git a/src/resize.c b/src/resize.c index 61c4ada7..994fd692 100644 --- a/src/resize.c +++ b/src/resize.c @@ -4,7 +4,7 @@ * 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) * * resize.c: Interactive resizing. * @@ -118,7 +118,7 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, /* 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); + 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. */ @@ -130,19 +130,19 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, if (orientation == HORIZ) { helprect.x = second->rect.x; helprect.y = second->rect.y; - helprect.width = 2; + 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); + second->rect.x, event->root_y); } else { helprect.x = second->rect.x; helprect.y = second->rect.y; helprect.width = second->rect.width; - helprect.height = 2; + 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); + event->root_x, second->rect.y); } mask = XCB_CW_BACK_PIXEL; @@ -152,9 +152,7 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, 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_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); @@ -163,7 +161,7 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, /* `new_position' will be updated by the `resize_callback'. */ new_position = initial_position; - const struct callback_params params = { orientation, output, helpwin, &new_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);