return outputs_dimensions;
}
+/**
+ * Called when a floating window is created or resized.
+ * This function resizes the window if its size is higher or lower than the
+ * configured maximum/minimum size, respectively.
+ *
+ */
+void floating_check_size(Con *floating_con) {
+ /* Define reasonable minimal and maximal sizes for floating windows */
+ const int floating_sane_min_height = 50;
+ const int floating_sane_min_width = 75;
+ Rect floating_sane_max_dimensions;
+ Con *focused_con = con_descend_focused(floating_con);
+
+ /* obey size increments */
+ if (focused_con->height_increment || focused_con->width_increment) {
+ Rect border_rect = con_border_style_rect(focused_con);
+
+ /* We have to do the opposite calculations that render_con() do
+ * to get the exact size we want. */
+ border_rect.width = -border_rect.width;
+ border_rect.width += 2 * focused_con->border_width;
+ border_rect.height = -border_rect.height;
+ border_rect.height += 2 * focused_con->border_width;
+ if (con_border_style(focused_con) == BS_NORMAL)
+ border_rect.height += render_deco_height();
+
+ if (focused_con->height_increment &&
+ floating_con->rect.height >= focused_con->base_height + border_rect.height) {
+ floating_con->rect.height -= focused_con->base_height + border_rect.height;
+ floating_con->rect.height -= floating_con->rect.height % focused_con->height_increment;
+ floating_con->rect.height += focused_con->base_height + border_rect.height;
+ }
+
+ if (focused_con->width_increment &&
+ floating_con->rect.width >= focused_con->base_width + border_rect.width) {
+ floating_con->rect.width -= focused_con->base_width + border_rect.width;
+ floating_con->rect.width -= floating_con->rect.width % focused_con->width_increment;
+ floating_con->rect.width += focused_con->base_width + border_rect.width;
+ }
+ }
+
+ /* Unless user requests otherwise (-1), ensure width/height do not exceed
+ * configured maxima or, if unconfigured, limit to combined width of all
+ * outputs */
+ if (config.floating_minimum_height != -1) {
+ if (config.floating_minimum_height == 0)
+ floating_con->rect.height = max(floating_con->rect.height, floating_sane_min_height);
+ else
+ floating_con->rect.height = max(floating_con->rect.height, config.floating_minimum_height);
+ }
+ if (config.floating_minimum_width != -1) {
+ if (config.floating_minimum_width == 0)
+ floating_con->rect.width = max(floating_con->rect.width, floating_sane_min_width);
+ else
+ floating_con->rect.width = max(floating_con->rect.width, config.floating_minimum_width);
+ }
+
+ /* Unless user requests otherwise (-1), raise the width/height to
+ * reasonable minimum dimensions */
+ floating_sane_max_dimensions = total_outputs_dimensions();
+ if (config.floating_maximum_height != -1) {
+ if (config.floating_maximum_height == 0)
+ floating_con->rect.height = min(floating_con->rect.height, floating_sane_max_dimensions.height);
+ else
+ floating_con->rect.height = min(floating_con->rect.height, config.floating_maximum_height);
+ }
+ if (config.floating_maximum_width != -1) {
+ if (config.floating_maximum_width == 0)
+ floating_con->rect.width = min(floating_con->rect.width, floating_sane_max_dimensions.width);
+ else
+ floating_con->rect.width = min(floating_con->rect.width, config.floating_maximum_width);
+ }
+}
+
void floating_enable(Con *con, bool automatic) {
bool set_focus = (con == focused);
* otherwise. */
Con *ws = con_get_workspace(con);
nc->parent = ws;
- nc->split = true;
nc->type = CT_FLOATING_CON;
nc->layout = L_SPLITH;
/* We insert nc already, even though its rect is not yet calculated. This
free(name);
/* find the height for the decorations */
- int deco_height = config.font.height + 5;
+ int deco_height = render_deco_height();
DLOG("Original rect: (%d, %d) with %d x %d\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height);
DLOG("Geometry = (%d, %d) with %d x %d\n", con->geometry.x, con->geometry.y, con->geometry.width, con->geometry.height);
- Rect zero = { 0, 0, 0, 0 };
+ Rect zero = {0, 0, 0, 0};
nc->rect = con->geometry;
/* If the geometry was not set (split containers), we need to determine a
* sensible one by combining the geometry of all children */
}
}
- /* Define reasonable minimal and maximal sizes for floating windows */
- const int floating_sane_min_height = 50;
- const int floating_sane_min_width = 75;
-
- Rect floating_sane_max_dimensions;
- floating_sane_max_dimensions = total_outputs_dimensions();
-
- /* Unless user requests otherwise (-1), ensure width/height do not exceed
- * configured maxima or, if unconfigured, limit to combined width of all
- * outputs */
- if (config.floating_maximum_height != -1) {
- if (config.floating_maximum_height == 0)
- nc->rect.height = min(nc->rect.height, floating_sane_max_dimensions.height);
- else
- nc->rect.height = min(nc->rect.height, config.floating_maximum_height);
- }
- if (config.floating_maximum_width != -1) {
- if (config.floating_maximum_width == 0)
- nc->rect.width = min(nc->rect.width, floating_sane_max_dimensions.width);
- else
- nc->rect.width = min(nc->rect.width, config.floating_maximum_width);
- }
-
- /* Unless user requests otherwise (-1), raise the width/height to
- * reasonable minimum dimensions */
- if (config.floating_minimum_height != -1) {
- if (config.floating_minimum_height == 0)
- nc->rect.height = max(nc->rect.height, floating_sane_min_height);
- else
- nc->rect.height = max(nc->rect.height, config.floating_minimum_height);
- }
- if (config.floating_minimum_width != -1) {
- if (config.floating_minimum_width == 0)
- nc->rect.width = max(nc->rect.width, floating_sane_min_width);
- else
- nc->rect.width = max(nc->rect.width, config.floating_minimum_width);
- }
+ floating_check_size(nc);
/* 3: attach the child to the new parent container. We need to do this
* because con_border_style_rect() needs to access con->parent. */
nc->rect.width -= border_style_rect.width;
/* Add some more pixels for the title bar */
- if(con_border_style(con) == BS_NORMAL)
+ if (con_border_style(con) == BS_NORMAL)
nc->rect.height += deco_height;
/* Honor the X11 border */
/* Sanity check: Are the coordinates on the appropriate output? If not, we
* need to change them */
- Output *current_output = get_output_containing(nc->rect.x, nc->rect.y);
+ Output *current_output = get_output_containing(nc->rect.x +
+ (nc->rect.width / 2),
+ nc->rect.y + (nc->rect.height / 2));
+
Con *correct_output = con_get_output(ws);
if (!current_output || current_output->con != correct_output) {
DLOG("This floating window is on the wrong output, fixing coordinates (currently (%d, %d))\n",
nc->rect.x, nc->rect.y);
- /* Take the relative coordinates of the current output, then add them
- * to the coordinate space of the correct output */
- uint32_t rel_x = (nc->rect.x - (current_output ? current_output->con->rect.x : 0));
- uint32_t rel_y = (nc->rect.y - (current_output ? current_output->con->rect.y : 0));
- nc->rect.x = correct_output->rect.x + rel_x;
- nc->rect.y = correct_output->rect.y + rel_y;
+
+ /* If moving from one output to another, keep the relative position
+ * consistent (e.g. a centered dialog will remain centered). */
+ if (current_output)
+ floating_fix_coordinates(nc, ¤t_output->con->rect, &correct_output->rect);
+ else {
+ nc->rect.x = correct_output->rect.x;
+ nc->rect.y = correct_output->rect.y;
+ }
}
DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
/* 5: Subtract the deco_height in order to make the floating window appear
* at precisely the position it specified in its original geometry (which
* is what applications might remember). */
- deco_height = (con->border_style == BS_NORMAL ? config.font.height + 5 : 0);
+ deco_height = (con->border_style == BS_NORMAL ? render_deco_height() : 0);
nc->rect.y -= deco_height;
DLOG("Corrected y = %d (deco_height = %d)\n", nc->rect.y, deco_height);
/* Check if we need to re-assign it to a different workspace because of its
* coordinates and exit if that was done successfully. */
- if (floating_maybe_reassign_ws(nc))
+ if (floating_maybe_reassign_ws(nc)) {
+ ipc_send_window_event("floating", con);
return;
+ }
/* Sanitize coordinates: Check if they are on any output */
- if (get_output_containing(nc->rect.x, nc->rect.y) != NULL)
+ if (get_output_containing(nc->rect.x, nc->rect.y) != NULL) {
+ ipc_send_window_event("floating", con);
return;
+ }
ELOG("No output found at destination coordinates, centering floating window on current ws\n");
nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
+
+ ipc_send_window_event("floating", con);
}
void floating_disable(Con *con, bool automatic) {
return;
}
+ const bool set_focus = (con == focused);
+
Con *ws = con_get_workspace(con);
/* 1: detach from parent container */
* workspace itself */
if (focused->type == CT_WORKSPACE)
con->parent = focused;
- else con->parent = focused->parent;
+ else
+ con->parent = focused->parent;
/* con_fix_percent will adjust the percent value */
con->percent = 0.0;
con_attach(con, con->parent, false);
con_fix_percent(con->parent);
- // TODO: don’t influence focus handling when Con was not focused before.
- con_focus(con);
+
+ if (set_focus)
+ con_focus(con);
+
+ ipc_send_window_event("floating", con);
}
/*
/* Check if we cross workspace boundaries while moving */
if (!floating_maybe_reassign_ws(con))
return;
+ /* Ensure not to warp the pointer while dragging */
+ x_set_warp_to(NULL);
tree_render();
}
* after the user releases the mouse button */
tree_render();
+ /* Store the initial rect in case of user revert/cancel */
+ Rect initial_rect = con->rect;
+
/* Drag the window */
- drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, XCURSOR_CURSOR_MOVE, drag_window_callback, event);
+ drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, XCURSOR_CURSOR_MOVE, drag_window_callback, event);
+
+ /* If the user cancelled, undo the changes. */
+ if (drag_result == DRAG_REVERT)
+ floating_reposition(con, initial_rect);
+
+ /* If this is a scratchpad window, don't auto center it from now on. */
+ if (con->scratchpad_state == SCRATCHPAD_FRESH)
+ con->scratchpad_state = SCRATCHPAD_CHANGED;
+
tree_render();
}
uint32_t dest_width;
uint32_t dest_height;
- double ratio = (double) old_rect->width / old_rect->height;
+ double ratio = (double)old_rect->width / old_rect->height;
/* First guess: We resize by exactly the amount the mouse moved,
* taking into account in which corner the client was grabbed */
if (corner & BORDER_LEFT)
dest_width = old_rect->width - (new_x - event->root_x);
- else dest_width = old_rect->width + (new_x - event->root_x);
+ else
+ dest_width = old_rect->width + (new_x - event->root_x);
if (corner & BORDER_TOP)
dest_height = old_rect->height - (new_y - event->root_y);
- else dest_height = old_rect->height + (new_y - event->root_y);
-
- /* Obey minimum window size */
- Rect minimum = con_minimum_size(con);
- dest_width = max(dest_width, minimum.width);
- dest_height = max(dest_height, minimum.height);
+ else
+ dest_height = old_rect->height + (new_y - event->root_y);
/* User wants to keep proportions, so we may have to adjust our values */
if (params->proportional) {
- dest_width = max(dest_width, (int) (dest_height * ratio));
- dest_height = max(dest_height, (int) (dest_width / ratio));
+ dest_width = max(dest_width, (int)(dest_height * ratio));
+ dest_height = max(dest_height, (int)(dest_width / ratio));
}
+ con->rect = (Rect){dest_x, dest_y, dest_width, dest_height};
+
+ /* Obey window size */
+ floating_check_size(con);
+
/* If not the lower right corner is grabbed, we must also reposition
* the client by exactly the amount we resized it */
if (corner & BORDER_LEFT)
- dest_x = old_rect->x + (old_rect->width - dest_width);
+ dest_x = old_rect->x + (old_rect->width - con->rect.width);
if (corner & BORDER_TOP)
- dest_y = old_rect->y + (old_rect->height - dest_height);
+ dest_y = old_rect->y + (old_rect->height - con->rect.height);
- con->rect = (Rect) { dest_x, dest_y, dest_width, dest_height };
+ con->rect.x = dest_x;
+ con->rect.y = dest_y;
/* TODO: don’t re-render the whole tree just because we change
* coordinates of a floating window */
* a bitmask of the nearest borders (BORDER_LEFT, BORDER_RIGHT, …) */
border_t corner = 0;
- if (event->event_x <= (con->rect.width / 2))
+ if (event->event_x <= (int16_t)(con->rect.width / 2))
corner |= BORDER_LEFT;
- else corner |= BORDER_RIGHT;
+ else
+ corner |= BORDER_RIGHT;
int cursor = 0;
- if (event->event_y <= (con->rect.height / 2)) {
+ if (event->event_y <= (int16_t)(con->rect.height / 2)) {
corner |= BORDER_TOP;
- cursor = (corner & BORDER_LEFT) ?
- XCURSOR_CURSOR_TOP_LEFT_CORNER : XCURSOR_CURSOR_TOP_RIGHT_CORNER;
- }
- else {
+ cursor = (corner & BORDER_LEFT) ? XCURSOR_CURSOR_TOP_LEFT_CORNER : XCURSOR_CURSOR_TOP_RIGHT_CORNER;
+ } else {
corner |= BORDER_BOTTOM;
- cursor = (corner & BORDER_LEFT) ?
- XCURSOR_CURSOR_BOTTOM_LEFT_CORNER : XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER;
+ cursor = (corner & BORDER_LEFT) ? XCURSOR_CURSOR_BOTTOM_LEFT_CORNER : XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER;
}
- struct resize_window_callback_params params = { corner, proportional, event };
+ struct resize_window_callback_params params = {corner, proportional, event};
- drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, cursor, resize_window_callback, ¶ms);
+ /* get the initial rect in case of revert/cancel */
+ Rect initial_rect = con->rect;
+
+ drag_result_t drag_result = drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, cursor, resize_window_callback, ¶ms);
+
+ /* If the user cancels, undo the resize */
+ if (drag_result == DRAG_REVERT)
+ floating_reposition(con, initial_rect);
+
+ /* If this is a scratchpad window, don't auto center it from now on. */
+ if (con->scratchpad_state == SCRATCHPAD_FRESH)
+ con->scratchpad_state = SCRATCHPAD_CHANGED;
+}
+
+/* As endorsed by “ASSOCIATING CUSTOM DATA WITH A WATCHER” in ev(3) */
+struct drag_x11_cb {
+ ev_check check;
+
+ /* Whether this modal event loop should be exited and with which result. */
+ drag_result_t result;
+
+ /* The container that is being dragged or resized, or NULL if this is a
+ * drag of the resize handle. */
+ Con *con;
+
+ /* The dimensions of con when the loop was started. */
+ Rect old_rect;
+
+ /* The callback to invoke after every pointer movement. */
+ callback_t callback;
+
+ /* User data pointer for callback. */
+ const void *extra;
+};
+
+static void xcb_drag_check_cb(EV_P_ ev_check *w, int revents) {
+ struct drag_x11_cb *dragloop = (struct drag_x11_cb *)w;
+ xcb_motion_notify_event_t *last_motion_notify = NULL;
+ xcb_generic_event_t *event;
+
+ while ((event = xcb_poll_for_event(conn)) != NULL) {
+ if (event->response_type == 0) {
+ xcb_generic_error_t *error = (xcb_generic_error_t *)event;
+ DLOG("X11 Error received (probably harmless)! sequence 0x%x, error_code = %d\n",
+ error->sequence, error->error_code);
+ free(event);
+ continue;
+ }
+
+ /* Strip off the highest bit (set if the event is generated) */
+ int type = (event->response_type & 0x7F);
+
+ switch (type) {
+ case XCB_BUTTON_RELEASE:
+ dragloop->result = DRAG_SUCCESS;
+ break;
+
+ case XCB_KEY_PRESS:
+ DLOG("A key was pressed during drag, reverting changes.");
+ dragloop->result = DRAG_REVERT;
+ handle_event(type, event);
+ break;
+
+ case XCB_UNMAP_NOTIFY: {
+ xcb_unmap_notify_event_t *unmap_event = (xcb_unmap_notify_event_t *)event;
+ Con *con = con_by_window_id(unmap_event->window);
+
+ if (con != NULL) {
+ DLOG("UnmapNotify for window 0x%08x (container %p)\n", unmap_event->window, con);
+
+ if (con_get_workspace(con) == con_get_workspace(focused)) {
+ DLOG("UnmapNotify for a managed window on the current workspace, aborting\n");
+ dragloop->result = DRAG_ABORT;
+ }
+ }
+
+ handle_event(type, event);
+ break;
+ }
+
+ case XCB_MOTION_NOTIFY:
+ /* motion_notify events are saved for later */
+ FREE(last_motion_notify);
+ last_motion_notify = (xcb_motion_notify_event_t *)event;
+ break;
+
+ default:
+ DLOG("Passing to original handler\n");
+ handle_event(type, event);
+ break;
+ }
+
+ if (last_motion_notify != (xcb_motion_notify_event_t *)event)
+ free(event);
+
+ if (dragloop->result != DRAGGING)
+ return;
+ }
+
+ if (last_motion_notify == NULL)
+ return;
+
+ dragloop->callback(
+ dragloop->con,
+ &(dragloop->old_rect),
+ last_motion_notify->root_x,
+ last_motion_notify->root_y,
+ dragloop->extra);
+ free(last_motion_notify);
}
/*
- * This function grabs your pointer and lets you drag stuff around (borders).
- * Every time you move your mouse, an XCB_MOTION_NOTIFY event will be received
- * and the given callback will be called with the parameters specified (client,
- * border on which the click originally was), the original rect of the client,
- * the event and the new coordinates (x, y).
+ * This function grabs your pointer and keyboard and lets you drag stuff around
+ * (borders). Every time you move your mouse, an XCB_MOTION_NOTIFY event will
+ * be received and the given callback will be called with the parameters
+ * specified (client, border on which the click originally was), the original
+ * rect of the client, the event and the new coordinates (x, y).
*
*/
-void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
- confine_to, border_t border, int cursor, callback_t callback, const void *extra)
-{
- uint32_t new_x, new_y;
- Rect old_rect = { 0, 0, 0, 0 };
- if (con != NULL)
- memcpy(&old_rect, &(con->rect), sizeof(Rect));
-
- Cursor xcursor = (cursor && xcursor_supported) ?
- xcursor_get_cursor(cursor) : XCB_NONE;
+drag_result_t drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
+ confine_to,
+ border_t border, int cursor, callback_t callback, const void *extra) {
+ xcb_cursor_t xcursor = (cursor && xcursor_supported) ? xcursor_get_cursor(cursor) : XCB_NONE;
/* Grab the pointer */
xcb_grab_pointer_cookie_t cookie;
xcb_grab_pointer_reply_t *reply;
+ xcb_generic_error_t *error;
+
cookie = xcb_grab_pointer(conn,
- false, /* get all pointer events specified by the following mask */
- root, /* grab the root window */
- XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION, /* which events to let through */
- XCB_GRAB_MODE_ASYNC, /* pointer events should continue as normal */
- XCB_GRAB_MODE_ASYNC, /* keyboard mode */
- confine_to, /* confine_to = in which window should the cursor stay */
- xcursor, /* possibly display a special cursor */
- XCB_CURRENT_TIME);
-
- if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL)) == NULL) {
- ELOG("Could not grab pointer\n");
- return;
+ false, /* get all pointer events specified by the following mask */
+ root, /* grab the root window */
+ XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION, /* which events to let through */
+ XCB_GRAB_MODE_ASYNC, /* pointer events should continue as normal */
+ XCB_GRAB_MODE_ASYNC, /* keyboard mode */
+ confine_to, /* confine_to = in which window should the cursor stay */
+ xcursor, /* possibly display a special cursor */
+ XCB_CURRENT_TIME);
+
+ if ((reply = xcb_grab_pointer_reply(conn, cookie, &error)) == NULL) {
+ ELOG("Could not grab pointer (error_code = %d)\n", error->error_code);
+ free(error);
+ return DRAG_ABORT;
}
free(reply);
- /* Go into our own event loop */
- xcb_flush(conn);
-
- xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
- bool loop_done = false;
- /* I’ve always wanted to have my own eventhandler… */
- while (!loop_done && (inside_event = xcb_wait_for_event(conn))) {
- /* We now handle all events we can get using xcb_poll_for_event */
- do {
- /* skip x11 errors */
- if (inside_event->response_type == 0) {
- free(inside_event);
- continue;
- }
- /* Strip off the highest bit (set if the event is generated) */
- int type = (inside_event->response_type & 0x7F);
-
- switch (type) {
- case XCB_BUTTON_RELEASE:
- loop_done = true;
- break;
-
- case XCB_MOTION_NOTIFY:
- /* motion_notify events are saved for later */
- FREE(last_motion_notify);
- last_motion_notify = inside_event;
- break;
-
- case XCB_UNMAP_NOTIFY:
- case XCB_KEY_PRESS:
- case XCB_KEY_RELEASE:
- DLOG("Unmap-notify, aborting\n");
- handle_event(type, inside_event);
- loop_done = true;
- break;
-
- default:
- DLOG("Passing to original handler\n");
- /* Use original handler */
- handle_event(type, inside_event);
- break;
- }
- if (last_motion_notify != inside_event)
- free(inside_event);
- } while ((inside_event = xcb_poll_for_event(conn)) != NULL);
-
- if (last_motion_notify == NULL || loop_done)
- continue;
-
- new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;
- new_y = ((xcb_motion_notify_event_t*)last_motion_notify)->root_y;
-
- callback(con, &old_rect, new_x, new_y, extra);
- FREE(last_motion_notify);
+ /* Grab the keyboard */
+ xcb_grab_keyboard_cookie_t keyb_cookie;
+ xcb_grab_keyboard_reply_t *keyb_reply;
+
+ keyb_cookie = xcb_grab_keyboard(conn,
+ false, /* get all keyboard events */
+ root, /* grab the root window */
+ XCB_CURRENT_TIME,
+ XCB_GRAB_MODE_ASYNC, /* continue processing pointer events as normal */
+ XCB_GRAB_MODE_ASYNC /* keyboard mode */
+ );
+
+ if ((keyb_reply = xcb_grab_keyboard_reply(conn, keyb_cookie, &error)) == NULL) {
+ ELOG("Could not grab keyboard (error_code = %d)\n", error->error_code);
+ free(error);
+ xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ return DRAG_ABORT;
}
+ free(keyb_reply);
+
+ /* Go into our own event loop */
+ struct drag_x11_cb loop = {
+ .result = DRAGGING,
+ .con = con,
+ .callback = callback,
+ .extra = extra,
+ };
+ if (con)
+ loop.old_rect = con->rect;
+ ev_check_init(&loop.check, xcb_drag_check_cb);
+ main_set_x11_cb(false);
+ ev_check_start(main_loop, &loop.check);
+
+ while (loop.result == DRAGGING)
+ ev_run(main_loop, EVRUN_ONCE);
+
+ ev_check_stop(main_loop, &loop.check);
+ main_set_x11_cb(true);
+
+ xcb_ungrab_keyboard(conn, XCB_CURRENT_TIME);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
xcb_flush(conn);
+
+ return loop.result;
}
/*
void floating_reposition(Con *con, Rect newrect) {
/* Sanity check: Are the new coordinates on any output? If not, we
* ignore that request. */
- Output *output = get_output_containing(
- newrect.x + (newrect.width / 2),
- newrect.y + (newrect.height / 2));
-
- if (!output) {
+ if (!contained_by_output(newrect)) {
ELOG("No output found at destination coordinates. Not repositioning.\n");
return;
}
con->rect = newrect;
floating_maybe_reassign_ws(con);
+
+ /* If this is a scratchpad window, don't auto center it from now on. */
+ if (con->scratchpad_state == SCRATCHPAD_FRESH)
+ con->scratchpad_state = SCRATCHPAD_CHANGED;
+
tree_render();
}
new_rect->x, new_rect->y, new_rect->width, new_rect->height);
/* First we get the x/y coordinates relative to the x/y coordinates
* of the output on which the window is on */
- int32_t rel_x = (con->rect.x - old_rect->x);
- int32_t rel_y = (con->rect.y - old_rect->y);
+ int32_t rel_x = con->rect.x - old_rect->x + (int32_t)(con->rect.width / 2);
+ int32_t rel_y = con->rect.y - old_rect->y + (int32_t)(con->rect.height / 2);
/* Then we calculate a fraction, for example 0.63 for a window
* which is at y = 1212 of a 1920 px high output */
DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n",
- rel_x, rel_y, (double)rel_x / old_rect->width, (double)rel_y / old_rect->height,
- old_rect->width, old_rect->height);
+ rel_x, rel_y, (double)rel_x / old_rect->width, (double)rel_y / old_rect->height,
+ old_rect->width, old_rect->height);
/* Here we have to multiply at first. Or we will lose precision when not compiled with -msse2 */
- con->rect.x = (int32_t)new_rect->x + (double)(rel_x * (int32_t)new_rect->width) / (int32_t)old_rect->width;
- con->rect.y = (int32_t)new_rect->y + (double)(rel_y * (int32_t)new_rect->height) / (int32_t)old_rect->height;
+ con->rect.x = (int32_t)new_rect->x + (double)(rel_x * (int32_t)new_rect->width) / (int32_t)old_rect->width - (int32_t)(con->rect.width / 2);
+ con->rect.y = (int32_t)new_rect->y + (double)(rel_y * (int32_t)new_rect->height) / (int32_t)old_rect->height - (int32_t)(con->rect.height / 2);
DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y);
}