* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
*
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/floating.c: contains all functions for handling floating clients
+ * floating.c: Floating windows.
*
*/
-
-
#include "all.h"
extern xcb_connection_t *conn;
+/*
+ * Calculates sum of heights and sum of widths of all currently active outputs
+ *
+ */
+static Rect total_outputs_dimensions(void) {
+ Output *output;
+ /* Use Rect to encapsulate dimensions, ignoring x/y */
+ Rect outputs_dimensions = {0, 0, 0, 0};
+ TAILQ_FOREACH(output, &outputs, outputs) {
+ outputs_dimensions.height += output->rect.height;
+ outputs_dimensions.width += output->rect.width;
+ }
+ return outputs_dimensions;
+}
+
void floating_enable(Con *con, bool automatic) {
+ bool set_focus = (con == focused);
+
+ if (con->parent && con->parent->type == CT_DOCKAREA) {
+ LOG("Container is a dock window, not enabling floating mode.\n");
+ return;
+ }
+
if (con_is_floating(con)) {
LOG("Container is already in floating mode, not doing anything.\n");
return;
}
+ /* 1: If the container is a workspace container, we need to create a new
+ * split-container with the same layout and make that one floating. We
+ * cannot touch the workspace container itself because floating containers
+ * are children of the workspace. */
+ if (con->type == CT_WORKSPACE) {
+ LOG("This is a workspace, creating new container around content\n");
+ if (con_num_children(con) == 0) {
+ LOG("Workspace is empty, aborting\n");
+ return;
+ }
+ /* TODO: refactor this with src/con.c:con_set_layout */
+ Con *new = con_new(NULL, NULL);
+ new->parent = con;
+ new->layout = con->layout;
+
+ /* since the new container will be set into floating mode directly
+ * afterwards, we need to copy the workspace rect. */
+ memcpy(&(new->rect), &(con->rect), sizeof(Rect));
+
+ Con *old_focused = TAILQ_FIRST(&(con->focus_head));
+ if (old_focused == TAILQ_END(&(con->focus_head)))
+ old_focused = NULL;
+
+ /* 4: move the existing cons of this workspace below the new con */
+ DLOG("Moving cons\n");
+ Con *child;
+ while (!TAILQ_EMPTY(&(con->nodes_head))) {
+ child = TAILQ_FIRST(&(con->nodes_head));
+ con_detach(child);
+ con_attach(child, new, true);
+ }
+
+ /* 4: attach the new split container to the workspace */
+ DLOG("Attaching new split to ws\n");
+ con_attach(new, con, false);
+
+ if (old_focused)
+ con_focus(old_focused);
+
+ con = new;
+ set_focus = false;
+ }
+
/* 1: detach the container from its parent */
/* TODO: refactor this with tree_close() */
TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
- con_fix_percent(con->parent, WINDOW_REMOVE);
+ con_fix_percent(con->parent);
/* 2: create a new container to render the decoration on, add
* it as a floating window to the workspace */
- Con *nc = con_new(NULL);
+ Con *nc = con_new(NULL, NULL);
/* we need to set the parent afterwards instead of passing it as an
* argument to con_new() because nc would be inserted into the tiling layer
* otherwise. */
- nc->parent = con_get_workspace(con);
+ 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
+ * is necessary because otherwise the workspace might be empty (and get
+ * closed in tree_close()) even though it’s not. */
+ TAILQ_INSERT_TAIL(&(ws->floating_head), nc, floating_windows);
+ TAILQ_INSERT_TAIL(&(ws->focus_head), nc, focused);
+
+ /* check if the parent container is empty and close it if so */
+ if ((con->parent->type == CT_CON || con->parent->type == CT_FLOATING_CON) &&
+ con_num_children(con->parent) == 0) {
+ DLOG("Old container empty after setting this child to floating, closing\n");
+ tree_close(con->parent, DONT_KILL_WINDOW, false, false);
+ }
char *name;
- asprintf(&name, "[i3 con] floatingcon around %p", con);
+ sasprintf(&name, "[i3 con] floatingcon around %p", con);
x_set_name(nc, name);
free(name);
/* find the height for the decorations */
- i3Font *font = load_font(conn, config.font);
- int deco_height = font->height + 5;
+ int deco_height = config.font.height + 5;
+
+ 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 };
+ 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 */
+ if (memcmp(&(nc->rect), &zero, sizeof(Rect)) == 0) {
+ DLOG("Geometry not set, combining children\n");
+ Con *child;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ DLOG("child geometry: %d x %d\n", child->geometry.width, child->geometry.height);
+ nc->rect.width += child->geometry.width;
+ nc->rect.height = max(nc->rect.height, child->geometry.height);
+ }
+ }
+
+ /* 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);
+ }
- nc->rect = con->rect;
/* add pixels for the decoration */
/* TODO: don’t add them when the user automatically puts new windows into
* 1pixel/borderless mode */
- nc->rect.height += deco_height + 4;
+ nc->rect.height += deco_height + 2;
nc->rect.width += 4;
- nc->orientation = NO_ORIENTATION;
- nc->type = CT_FLOATING_CON;
- TAILQ_INSERT_TAIL(&(nc->parent->floating_head), nc, floating_windows);
- TAILQ_INSERT_TAIL(&(nc->parent->focus_head), nc, focused);
- /* 3: attach the child to the new parent container */
- con->old_parent = con->parent;
- con->parent = nc;
- con->floating = FLOATING_USER_ON;
+ /* Honor the X11 border */
+ nc->rect.height += con->border_width * 2;
+ nc->rect.width += con->border_width * 2;
/* Some clients (like GIMP’s color picker window) get mapped
* to (0, 0), so we push them to a reasonable position
nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
} else {
/* center the window on workspace as fallback */
- Con *ws = nc->parent;
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);
}
}
+ /* 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);
+ 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;
+ }
+
+ DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
+
+ /* 3: attach the child to the new parent container */
+ con->parent = nc;
+ con->percent = 1.0;
+ con->floating = FLOATING_USER_ON;
+
+ /* 4: set the border style as specified with new_float */
+ if (automatic)
+ con->border_style = config.default_floating_border;
+
+ /* 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);
+ nc->rect.y -= deco_height;
+
+ DLOG("Corrected y = %d (deco_height = %d)\n", nc->rect.y, deco_height);
+
TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
- // TODO: don’t influence focus handling when Con was not focused before.
- con_focus(con);
+
+ /* render the cons to get initial window_rect correct */
+ render_con(nc, false);
+ render_con(con, false);
+
+ if (set_focus)
+ con_focus(con);
+
+ /* 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))
+ return;
+
+ /* Sanitize coordinates: Check if they are on any output */
+ if (get_output_containing(nc->rect.x, nc->rect.y) != NULL)
+ 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);
}
void floating_disable(Con *con, bool automatic) {
return;
}
- assert(con->old_parent != NULL);
+ Con *ws = con_get_workspace(con);
/* 1: detach from parent container */
TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
/* 2: kill parent container */
TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
- tree_close(con->parent, false, false);
+ tree_close(con->parent, DONT_KILL_WINDOW, true, false);
+
+ /* 3: re-attach to the parent of the currently focused con on the workspace
+ * this floating con was on */
+ Con *focused = con_descend_tiling_focused(ws);
+
+ /* if there is no other container on this workspace, focused will be the
+ * workspace itself */
+ if (focused->type == CT_WORKSPACE)
+ con->parent = focused;
+ else con->parent = focused->parent;
- /* 3: re-attach to previous parent */
- con->parent = con->old_parent;
- TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
- TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
+ /* con_fix_percent will adjust the percent value */
+ con->percent = 0.0;
con->floating = FLOATING_USER_OFF;
- con_fix_percent(con->parent, WINDOW_ADD);
+ 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);
}
-
/*
* Toggles floating mode for the given container.
*
*
*/
void toggle_floating_mode(Con *con, bool automatic) {
- //i3Font *font = load_font(conn, config.font);
-
- /* see if the client is already floating */
- if (con_is_floating(con)) {
- LOG("already floating, re-setting to tiling\n");
-
- floating_disable(con, automatic);
- return;
- }
-
- floating_enable(con, automatic);
-
-
-#if 0
- if (client->dock) {
- DLOG("Not putting dock client into floating mode\n");
- return;
- }
-
- if (con == NULL) {
- DLOG("This client is already in floating (container == NULL), re-inserting\n");
- Client *next_tiling;
- Workspace *ws = client->workspace;
- SLIST_FOREACH(next_tiling, &(ws->focus_stack), focus_clients)
- if (!client_is_floating(next_tiling))
- break;
- /* If there are no tiling clients on this workspace, there can only be one
- * container: the first one */
- if (next_tiling == TAILQ_END(&(ws->focus_stack)))
- con = ws->table[0][0];
- else con = next_tiling->container;
-
- /* Remove the client from the list of floating clients */
- TAILQ_REMOVE(&(ws->floating_clients), client, floating_clients);
-
- DLOG("destination container = %p\n", con);
- Client *old_focused = con->currently_focused;
- /* Preserve position/size */
- memcpy(&(client->floating_rect), &(client->rect), sizeof(Rect));
-
- client->floating = FLOATING_USER_OFF;
- client->container = con;
-
- if (old_focused != NULL && !old_focused->dock)
- CIRCLEQ_INSERT_AFTER(&(con->clients), old_focused, client, clients);
- else CIRCLEQ_INSERT_TAIL(&(con->clients), client, clients);
-
- DLOG("Re-inserted the window.\n");
- con->currently_focused = client;
-
- client_set_below_floating(conn, client);
-
- render_container(conn, con);
- xcb_flush(conn);
-
- return;
- }
-
- DLOG("Entering floating for client %08x\n", client->child);
-
- /* Remove the client of its container */
- client_remove_from_container(conn, client, con, false);
- client->container = NULL;
-
- /* Add the client to the list of floating clients for its workspace */
- TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
-
- if (con->currently_focused == client) {
- DLOG("Need to re-adjust currently_focused\n");
- /* Get the next client in the focus stack for this particular container */
- con->currently_focused = get_last_focused_client(conn, con, NULL);
- }
-
- if (automatic)
- client->floating = FLOATING_AUTO_ON;
- else client->floating = FLOATING_USER_ON;
-
- /* Initialize the floating position from the position in tiling mode, if this
- * client never was floating (x == -1) */
- if (client->floating_rect.x == -1) {
- /* Copy over the position */
- client->floating_rect.x = client->rect.x;
- client->floating_rect.y = client->rect.y;
-
- /* Copy size the other direction */
- client->child_rect.width = client->floating_rect.width;
- client->child_rect.height = client->floating_rect.height;
-
- client->rect.width = client->child_rect.width + 2 + 2;
- client->rect.height = client->child_rect.height + (font->height + 2 + 2) + 2;
-
- DLOG("copying size from tiling (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
- client->floating_rect.width, client->floating_rect.height);
- } else {
- /* If the client was already in floating before we restore the old position / size */
- DLOG("using: (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
- client->floating_rect.width, client->floating_rect.height);
- memcpy(&(client->rect), &(client->floating_rect), sizeof(Rect));
- }
+ /* see if the client is already floating */
+ if (con_is_floating(con)) {
+ LOG("already floating, re-setting to tiling\n");
- /* Raise the client */
- xcb_raise_window(conn, client->frame);
- reposition_client(conn, client);
- resize_client(conn, client);
- /* redecorate_window flushes */
- redecorate_window(conn, client);
+ floating_disable(con, automatic);
+ return;
+ }
- /* Re-render the tiling layout of this container */
- render_container(conn, con);
- xcb_flush(conn);
-#endif
+ floating_enable(con, automatic);
}
-#if 0
/*
- * Removes the floating client from its workspace and attaches it to the new workspace.
- * This is centralized here because it may happen if you move it via keyboard and
- * if you move it using your mouse.
+ * Raises the given container in the list of floating containers
*
*/
-void floating_assign_to_workspace(Client *client, Workspace *new_workspace) {
- /* Remove from focus stack and list of floating clients */
- SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
- TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
-
- if (client->workspace->fullscreen_client == client)
- client->workspace->fullscreen_client = NULL;
-
- /* Insert into destination focus stack and list of floating clients */
- client->workspace = new_workspace;
- SLIST_INSERT_HEAD(&(client->workspace->focus_stack), client, focus_clients);
- TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
- if (client->fullscreen)
- client->workspace->fullscreen_client = client;
+void floating_raise_con(Con *con) {
+ DLOG("Raising floating con %p / %s\n", con, con->name);
+ TAILQ_REMOVE(&(con->parent->floating_head), con, floating_windows);
+ TAILQ_INSERT_TAIL(&(con->parent->floating_head), con, floating_windows);
}
/*
- * 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).
+ * Checks if con’s coordinates are within its workspace and re-assigns it to
+ * the actual workspace if not.
*
*/
-struct resize_callback_params {
- border_t border;
- xcb_button_press_event_t *event;
-};
-
-DRAGGING_CB(resize_callback) {
- struct resize_callback_params *params = extra;
- xcb_button_press_event_t *event = params->event;
- switch (params->border) {
- case BORDER_RIGHT: {
- int new_width = old_rect->width + (new_x - event->root_x);
- if ((new_width < 0) ||
- (new_width < client_min_width(client) && client->rect.width >= new_width))
- return;
- client->rect.width = new_width;
- break;
- }
-
- case BORDER_BOTTOM: {
- int new_height = old_rect->height + (new_y - event->root_y);
- if ((new_height < 0) ||
- (new_height < client_min_height(client) && client->rect.height >= new_height))
- return;
- client->rect.height = old_rect->height + (new_y - event->root_y);
- break;
- }
-
- case BORDER_TOP: {
- int new_height = old_rect->height + (event->root_y - new_y);
- if ((new_height < 0) ||
- (new_height < client_min_height(client) && client->rect.height >= new_height))
- return;
+bool floating_maybe_reassign_ws(Con *con) {
+ Output *output = get_output_containing(
+ con->rect.x + (con->rect.width / 2),
+ con->rect.y + (con->rect.height / 2));
+
+ if (!output) {
+ ELOG("No output found at destination coordinates?\n");
+ return false;
+ }
- client->rect.y = old_rect->y + (new_y - event->root_y);
- client->rect.height = new_height;
- break;
- }
+ if (con_get_output(con) == output->con) {
+ DLOG("still the same ws\n");
+ return false;
+ }
- case BORDER_LEFT: {
- int new_width = old_rect->width + (event->root_x - new_x);
- if ((new_width < 0) ||
- (new_width < client_min_width(client) && client->rect.width >= new_width))
- return;
- client->rect.x = old_rect->x + (new_x - event->root_x);
- client->rect.width = new_width;
- break;
- }
- }
+ DLOG("Need to re-assign!\n");
- /* Push the new position/size to X11 */
- reposition_client(conn, client);
- resize_client(conn, client);
- xcb_flush(conn);
+ Con *content = output_get_content(output->con);
+ Con *ws = TAILQ_FIRST(&(content->focus_head));
+ DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
+ con_move_to_workspace(con, ws, false, true);
+ con_focus(con_descend_focused(con));
+ return true;
}
+DRAGGING_CB(drag_window_callback) {
+ const struct xcb_button_press_event_t *event = extra;
-/*
- * Called whenever the user clicks on a border (not the titlebar!) of a floating window.
- * Determines on which border the user clicked and launches the drag_pointer function
- * with the resize_callback.
- *
- */
-int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) {
- DLOG("floating border click\n");
-
- border_t border;
-
- if (event->event_y < 2)
- border = BORDER_TOP;
- else if (event->event_y >= (client->rect.height - 2))
- border = BORDER_BOTTOM;
- else if (event->event_x <= 2)
- border = BORDER_LEFT;
- else if (event->event_x >= (client->rect.width - 2))
- border = BORDER_RIGHT;
- else {
- DLOG("Not on any border, not doing anything.\n");
- return 1;
- }
-
- DLOG("border = %d\n", border);
-
- struct resize_callback_params params = { border, event };
+ /* Reposition the client correctly while moving */
+ con->rect.x = old_rect->x + (new_x - event->root_x);
+ con->rect.y = old_rect->y + (new_y - event->root_y);
- drag_pointer(conn, client, event, XCB_NONE, border, resize_callback, ¶ms);
+ render_con(con, false);
+ x_push_node(con);
+ xcb_flush(conn);
- return 1;
-}
-
-#endif
-DRAGGING_CB(drag_window_callback) {
- struct xcb_button_press_event_t *event = extra;
-
- /* Reposition the client correctly while moving */
- con->rect.x = old_rect->x + (new_x - event->root_x);
- con->rect.y = old_rect->y + (new_y - event->root_y);
- /* TODO: don’t re-render the whole tree just because we change
- * coordinates of a floating window */
- tree_render();
- x_push_changes(croot);
+ /* Check if we cross workspace boundaries while moving */
+ if (!floating_maybe_reassign_ws(con))
+ return;
+ tree_render();
}
/*
* Calls the drag_pointer function with the drag_window callback
*
*/
-void floating_drag_window(Con *con, xcb_button_press_event_t *event) {
- DLOG("floating_drag_window\n");
+void floating_drag_window(Con *con, const xcb_button_press_event_t *event) {
+ DLOG("floating_drag_window\n");
+
+ /* Push changes before dragging, so that the window gets raised now and not
+ * after the user releases the mouse button */
+ tree_render();
- drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
- tree_render();
+ /* Drag the window */
+ drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
+ tree_render();
}
/*
*
*/
struct resize_window_callback_params {
- border_t corner;
- bool proportional;
- xcb_button_press_event_t *event;
+ const border_t corner;
+ const bool proportional;
+ const xcb_button_press_event_t *event;
};
DRAGGING_CB(resize_window_callback) {
- struct resize_window_callback_params *params = extra;
- xcb_button_press_event_t *event = params->event;
+ const struct resize_window_callback_params *params = extra;
+ const xcb_button_press_event_t *event = params->event;
border_t corner = params->corner;
int32_t dest_x = con->rect.x;
/* 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);
+ 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);
+ dest_height = old_rect->height - (new_y - event->root_y);
else dest_height = old_rect->height + (new_y - event->root_y);
- /* TODO: minimum window size */
-#if 0
/* Obey minimum window size */
- dest_width = max(dest_width, client_min_width(client));
- dest_height = max(dest_height, client_min_height(client));
-#endif
+ Rect minimum = con_minimum_size(con);
+ dest_width = max(dest_width, minimum.width);
+ dest_height = max(dest_height, minimum.height);
/* 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));
}
/* 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 - dest_width);
if (corner & BORDER_TOP)
- dest_y = old_rect->y + (old_rect->height - dest_height);
+ dest_y = old_rect->y + (old_rect->height - dest_height);
con->rect = (Rect) { dest_x, dest_y, dest_width, dest_height };
* Calls the drag_pointer function with the resize_window callback
*
*/
-void floating_resize_window(Con *con, bool proportional,
- xcb_button_press_event_t *event) {
+void floating_resize_window(Con *con, const bool proportional,
+ const xcb_button_press_event_t *event) {
DLOG("floating_resize_window\n");
/* corner saves the nearest corner to the original click. It contains
border_t corner = 0;
if (event->event_x <= (con->rect.width / 2))
- corner |= BORDER_LEFT;
+ corner |= BORDER_LEFT;
else corner |= BORDER_RIGHT;
if (event->event_y <= (con->rect.height / 2))
- corner |= BORDER_TOP;
- else corner |= BORDER_RIGHT;
+ corner |= BORDER_TOP;
+ else corner |= BORDER_BOTTOM;
struct resize_window_callback_params params = { corner, proportional, event };
* the event and the new coordinates (x, y).
*
*/
-void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
- confine_to, border_t border, callback_t callback, void *extra)
+void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
+ confine_to, border_t border, callback_t callback, const void *extra)
{
- xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
- uint32_t new_x, new_y;
- Rect old_rect;
- if (con != NULL)
- memcpy(&old_rect, &(con->rect), sizeof(Rect));
-
- /* Grab the pointer */
- /* TODO: returncode */
- 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 */
- XCB_NONE, /* don’t display a special cursor */
- XCB_CURRENT_TIME);
-
- /* Go into our own event loop */
- xcb_flush(conn);
+ uint32_t new_x, new_y;
+ Rect old_rect;
+ if (con != NULL)
+ memcpy(&old_rect, &(con->rect), sizeof(Rect));
+
+ /* Grab the pointer */
+ xcb_grab_pointer_cookie_t cookie;
+ xcb_grab_pointer_reply_t *reply;
+ 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 */
+ XCB_NONE, /* don’t display a special cursor */
+ XCB_CURRENT_TIME);
+
+ if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL)) == NULL) {
+ ELOG("Could not grab pointer\n");
+ return;
+ }
- xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
- /* I’ve always wanted to have my own eventhandler… */
- while ((inside_event = xcb_wait_for_event(conn))) {
- /* We now handle all events we can get using xcb_poll_for_event */
- do {
- /* 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);
-
- switch (nr) {
- case XCB_BUTTON_RELEASE:
- goto done;
-
- 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:
- DLOG("Unmap-notify, aborting\n");
- xcb_event_handle(&evenths, inside_event);
- goto done;
-
- default:
- DLOG("Passing to original handler\n");
- /* Use original handler */
- xcb_event_handle(&evenths, 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)
- 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);
- }
-done:
- xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- xcb_flush(conn);
+ 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)
+ 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);
+ }
+
+ xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ xcb_flush(conn);
}
-#if 0
/*
- * Changes focus in the given direction for floating clients.
- *
- * Changing to the left/right means going to the previous/next floating client,
- * changing to top/bottom means cycling through the Z-index.
+ * Repositions the CT_FLOATING_CON to have the coordinates specified by
+ * newrect, but only if the coordinates are not out-of-bounds. Also reassigns
+ * the floating con to a different workspace if this move was across different
+ * outputs.
*
*/
-void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, direction_t direction) {
- DLOG("floating focus\n");
+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) {
+ ELOG("No output found at destination coordinates. Not repositioning.\n");
+ return;
+ }
- if (direction == D_LEFT || direction == D_RIGHT) {
- /* Go to the next/previous floating client */
- Client *client;
+ con->rect = newrect;
- while ((client = (direction == D_LEFT ? TAILQ_PREV(currently_focused, floating_clients_head, floating_clients) :
- TAILQ_NEXT(currently_focused, floating_clients))) !=
- TAILQ_END(&(currently_focused->workspace->floating_clients))) {
- if (!client->floating)
- continue;
- set_focus(conn, client, true);
- return;
- }
- }
+ floating_maybe_reassign_ws(con);
+ tree_render();
+}
+
+/*
+ * Fixes the coordinates of the floating window whenever the window gets
+ * reassigned to a different output (or when the output’s rect changes).
+ *
+ */
+void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect) {
+ DLOG("Fixing coordinates of floating window %p (rect (%d, %d), %d x %d)\n",
+ con, con->rect.x, con->rect.y, con->rect.width, con->rect.height);
+ DLOG("old_rect = (%d, %d), %d x %d\n",
+ old_rect->x, old_rect->y, old_rect->width, old_rect->height);
+ DLOG("new_rect = (%d, %d), %d x %d\n",
+ 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);
+ /* 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);
+ /* 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;
+ DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y);
}
+#if 0
/*
* Moves the client 10px to the specified direction.
*
projects / i3 / i3 / blobdiff