* 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;
* otherwise. */
Con *ws = con_get_workspace(con);
nc->parent = ws;
+ nc->orientation = NO_ORIENTATION;
+ nc->type = CT_FLOATING_CON;
+ /* 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) {
+ 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);
}
DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
- nc->orientation = NO_ORIENTATION;
- nc->type = CT_FLOATING_CON;
- TAILQ_INSERT_TAIL(&(ws->floating_head), nc, floating_windows);
- TAILQ_INSERT_TAIL(&(ws->focus_head), nc, focused);
/* 3: attach the child to the new parent container */
con->parent = nc;
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);
/* con_fix_percent will adjust the percent value */
con->percent = 0.0;
- TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
- TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
-
con->floating = FLOATING_USER_OFF;
+ 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);
}
DRAGGING_CB(drag_window_callback) {
- struct xcb_button_press_event_t *event = extra;
+ const 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);
* Calls the drag_pointer function with the drag_window callback
*
*/
-void floating_drag_window(Con *con, xcb_button_press_event_t *event) {
+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
*
*/
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;
* 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
* 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)
{
uint32_t new_x, new_y;
Rect old_rect;
xcb_flush(conn);
}
+/*
+ * 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_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;
+ }
+
+ con->rect = newrect;
+
+ 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\n", con);
+ /* First we get the x/y coordinates relative to the x/y coordinates
+ * of the output on which the window is on */
+ uint32_t rel_x = (con->rect.x - old_rect->x);
+ uint32_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 */
+ double fraction_x = ((double)rel_x / old_rect->width);
+ double fraction_y = ((double)rel_y / old_rect->height);
+ DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n",
+ rel_x, rel_y, fraction_x, fraction_y, old_rect->width, old_rect->height);
+ con->rect.x = new_rect->x + (fraction_x * new_rect->width);
+ con->rect.y = new_rect->y + (fraction_y * new_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