#include "xcb.h"
#include "debug.h"
#include "layout.h"
+#include "xinerama.h"
+#include "config.h"
+#include "floating.h"
/*
* Renders the resize window between the first/second container and resizes
* the table column/row.
*
*/
-int resize_graphical_handler(xcb_connection_t *conn, Container *first, Container *second,
+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_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
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);
/* FIXME: horizontal resizing causes empty spaces to exist */
if (orientation == O_HORIZONTAL) {
Rect helprect;
if (orientation == O_VERTICAL) {
helprect.x = event->root_x;
- helprect.y = 0;
+ helprect.y = screen->rect.y;
helprect.width = 2;
- helprect.height = root_screen->height_in_pixels;
+ helprect.height = screen->rect.height;
new_position = event->root_x;
} else {
helprect.x = 0;
}
mask = XCB_CW_BACK_PIXEL;
- values[0] = get_colorpixel(conn, "#4c7899");
+ values[0] = config.client.focused.border;
mask |= XCB_CW_OVERRIDE_REDIRECT;
values[1] = 1;
xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
- xcb_grab_pointer(conn, false, root, XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION,
- XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, grabwin, XCB_NONE, XCB_CURRENT_TIME);
-
xcb_flush(conn);
- xcb_generic_event_t *inside_event;
- /* I’ve always wanted to have my own eventhandler… */
- while ((inside_event = xcb_wait_for_event(conn))) {
- /* Same as get_event_handler in xcb */
- int nr = inside_event->response_type;
- if (nr == 0) {
- /* An error occured */
- handle_event(NULL, conn, inside_event);
- free(inside_event);
- continue;
+ 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 - 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);
}
- assert(nr < 256);
- nr &= XCB_EVENT_RESPONSE_TYPE_MASK;
- assert(nr >= 2);
-
- /* Check if we need to escape this loop */
- if (nr == XCB_BUTTON_RELEASE)
- break;
-
- switch (nr) {
- case XCB_MOTION_NOTIFY:
- if (orientation == O_VERTICAL) {
- values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_x;
- xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_X, values);
- } else {
- values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_y;
- xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_Y, values);
- }
-
- xcb_flush(conn);
- break;
- default:
- LOG("Passing to original handler\n");
- /* Use original handler */
- xcb_event_handle(&evenths, inside_event);
- break;
- }
- free(inside_event);
+
+ xcb_flush(conn);
}
- xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback);
+
xcb_destroy_window(conn, helpwin);
xcb_destroy_window(conn, grabwin);
xcb_flush(conn);
- Workspace *ws = first->workspace;
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) {
if (old_unoccupied_x == 0)
old_unoccupied_x = ws->rect.width;
- if (ws->width_factor[first->col] == 0)
+ if (ws->width_factor[first] == 0)
new_unoccupied_x += default_width;
- if (ws->width_factor[second->col] == 0)
+ if (ws->width_factor[second] == 0)
new_unoccupied_x += default_width;
LOG("\n\n\n");
LOG("old_unoccupied_x = %d\n", old_unoccupied_x);
- LOG("Updating first (before = %f)\n", ws->width_factor[first->col]);
+ LOG("Updating first (before = %f)\n", ws->width_factor[first]);
/* Convert 0 (for default width_factor) to actual numbers */
- if (ws->width_factor[first->col] == 0)
- ws->width_factor[first->col] = ((float)ws->rect.width / ws->cols) / new_unoccupied_x;
-
- LOG("middle = %f\n", ws->width_factor[first->col]);
- LOG("first->width = %d, new_position = %d, event->root_x = %d\n", first->width, new_position, event->root_x);
- ws->width_factor[first->col] *= (float)(first->width + (new_position - event->root_x)) / first->width;
- LOG("-> %f\n", ws->width_factor[first->col]);
-
-
- LOG("Updating second (before = %f)\n", ws->width_factor[second->col]);
- if (ws->width_factor[second->col] == 0)
- ws->width_factor[second->col] = ((float)ws->rect.width / ws->cols) / new_unoccupied_x;
- LOG("middle = %f\n", ws->width_factor[second->col]);
- LOG("second->width = %d, new_position = %d, event->root_x = %d\n", second->width, new_position, event->root_x);
- ws->width_factor[second->col] *= (float)(second->width - (new_position - event->root_x)) / second->width;
- LOG("-> %f\n", ws->width_factor[second->col]);
+ 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));
projects / i3 / i3 / blobdiff