*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
#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
*/
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);
+ uint32_t new_position;
+ Output *screen = get_output_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);
+ ELOG("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);
+ /* 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);
- /* 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;
- }
+ 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];
/* 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 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.height = screen->rect.height;
new_position = event->root_x;
} else {
- helprect.x = 0;
+ helprect.x = screen->rect.x;
helprect.y = event->root_y;
- helprect.width = root_screen->width_in_pixels;
+ helprect.width = screen->rect.width;
helprect.height = 2;
new_position = event->root_y;
}
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_CURSOR_SB_H_DOUBLE_ARROW :
+ XCB_CURSOR_SB_V_DOUBLE_ARROW), true, mask, values);
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;
- }
- 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: {
- xcb_motion_notify_event_t *motion_event = (xcb_motion_notify_event_t*)inside_event;
- if (orientation == O_VERTICAL) {
- if (motion_event->root_x < (screen->rect.x + screen->rect.width) &&
- motion_event->root_x > screen->rect.x) {
- values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_x;
- xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_X, values);
- } else {
- LOG("Ignoring new position\n");
- }
- } 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);
- }
+ struct callback_params params = { orientation, screen, helpwin, &new_position };
+
+ drag_pointer(conn, NULL, event, grabwin, BORDER_TOP, resize_callback, ¶ms);
- xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
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;
- }
+ 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);
+ return 1;
+}
+
+/*
+ * 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) {
+
+ /* TODO: refactor this, both blocks are very identical */
+ if (orientation == O_VERTICAL) {
int default_width = ws->rect.width / ws->cols;
int old_unoccupied_x = get_unoccupied_x(ws);
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);
+ DLOG("\n\n\n");
+ DLOG("old = %d, new = %d\n", old_unoccupied_x, new_unoccupied_x);
+
+ int cols_without_wf = 0;
+ int old_width, old_second_width;
+ for (int col = 0; col < ws->cols; col++)
+ if (ws->width_factor[col] == 0)
+ cols_without_wf++;
+
+ DLOG("old_unoccupied_x = %d\n", old_unoccupied_x);
+
+ DLOG("Updating first (before = %f)\n", ws->width_factor[first]);
+ /* Convert 0 (for default width_factor) to actual numbers */
+ if (ws->width_factor[first] == 0)
+ old_width = (old_unoccupied_x / max(cols_without_wf, 1));
+ else old_width = ws->width_factor[first] * old_unoccupied_x;
+
+ DLOG("second (before = %f)\n", ws->width_factor[second]);
+ if (ws->width_factor[second] == 0)
+ old_second_width = (old_unoccupied_x / max(cols_without_wf, 1));
+ else old_second_width = ws->width_factor[second] * old_unoccupied_x;
+
+ DLOG("middle = %f\n", ws->width_factor[first]);
/* If the space used for customly resized columns has changed we need to adapt the
* other customly resized columns, if any */
if (ws->width_factor[col] == 0)
continue;
- LOG("Updating other column (%d) (current width_factor = %f)\n", col, ws->width_factor[col]);
+ DLOG("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]);
+ DLOG("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]);
+ DLOG("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]);
+ DLOG("first->width = %d, pixels = %d\n", old_width, pixels);
+ ws->width_factor[first] *= (float)(old_width + pixels) / old_width;
+ DLOG("-> %f\n", ws->width_factor[first]);
- LOG("Updating second (before = %f)\n", ws->width_factor[second]);
+ DLOG("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));
+ DLOG("middle = %f\n", ws->width_factor[second]);
+ DLOG("second->width = %d, pixels = %d\n", old_second_width, pixels);
+ ws->width_factor[second] *= (float)(old_second_width - pixels) / old_second_width;
+ DLOG("-> %f\n", ws->width_factor[second]);
+
+ DLOG("new unoccupied_x = %d\n", get_unoccupied_x(ws));
- LOG("\n\n\n");
+ DLOG("\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
+ int ws_height = workspace_height(ws);
+ int default_height = ws_height / ws->rows;
+ int old_unoccupied_y = get_unoccupied_y(ws);
+
+ /* We pre-calculate the unoccupied space to see if we need to adapt sizes before
+ * doing the resize */
+ int new_unoccupied_y = old_unoccupied_y;
+
+ if (old_unoccupied_y == 0)
+ old_unoccupied_y = ws_height;
+
+ if (ws->height_factor[first] == 0)
+ new_unoccupied_y += default_height;
+
+ if (ws->height_factor[second] == 0)
+ new_unoccupied_y += default_height;
+
+ int cols_without_hf = 0;
+ int old_height, old_second_height;
+ for (int row = 0; row < ws->rows; row++)
+ if (ws->height_factor[row] == 0)
+ cols_without_hf++;
+
+ 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));
+ else old_height = ws->height_factor[first] * old_unoccupied_y;
+
+ DLOG("second (before = %f)\n", ws->height_factor[second]);
+ if (ws->height_factor[second] == 0)
+ old_second_height = (old_unoccupied_y / max(cols_without_hf, 1));
+ else old_second_height = ws->height_factor[second] * old_unoccupied_y;
+
+ DLOG("middle = %f\n", ws->height_factor[first]);
+
+
+ DLOG("\n\n\n");
+ DLOG("old = %d, new = %d\n", old_unoccupied_y, new_unoccupied_y);
+
+ /* If the space used for customly resized columns has changed we need to adapt the
+ * other customly resized columns, if any */
+ if (new_unoccupied_y != old_unoccupied_y)
+ for (int row = 0; row < ws->rows; row++) {
+ if (ws->height_factor[row] == 0)
+ continue;
+
+ DLOG("Updating other column (%d) (current width_factor = %f)\n", row, ws->height_factor[row]);
+ ws->height_factor[row] = (ws->height_factor[row] * old_unoccupied_y) / new_unoccupied_y;
+ DLOG("to %f\n", ws->height_factor[row]);
+ }
+
+
+ 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)
+ ws->height_factor[first] = ((float)ws_height / ws->rows) / new_unoccupied_y;
+
+ DLOG("first->width = %d, pixels = %d\n", old_height, pixels);
+ ws->height_factor[first] *= (float)(old_height + pixels) / old_height;
+ DLOG("-> %f\n", ws->height_factor[first]);
+
+
+ DLOG("Updating second (before = %f)\n", ws->height_factor[second]);
+ if (ws->height_factor[second] == 0)
+ ws->height_factor[second] = ((float)ws_height / ws->rows) / new_unoccupied_y;
+ DLOG("middle = %f\n", ws->height_factor[second]);
+ DLOG("second->width = %d, pixels = %d\n", old_second_height, pixels);
+ ws->height_factor[second] *= (float)(old_second_height - pixels) / old_second_height;
+ DLOG("-> %f\n", ws->height_factor[second]);
+
+ DLOG("new unoccupied_y = %d\n", get_unoccupied_y(ws));
+
+ DLOG("\n\n\n");
}
render_layout(conn);
-
- return 1;
}
projects / i3 / i3 / blobdiff