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);
}
/* 1: If the container is a workspace container, we need to create a new
- * split-container with the same orientation and make that one floating. We
+ * 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) {
/* TODO: refactor this with src/con.c:con_set_layout */
Con *new = con_new(NULL, NULL);
new->parent = con;
- new->orientation = con->orientation;
+ new->layout = con->layout;
/* since the new container will be set into floating mode directly
* afterwards, we need to copy the workspace rect. */
* otherwise. */
Con *ws = con_get_workspace(con);
nc->parent = ws;
- nc->orientation = NO_ORIENTATION;
+ 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. */
nc->rect.height = max(nc->rect.height, child->geometry.height);
}
}
- /* Raise the width/height to at least 75x50 (minimum size for windows) */
- nc->rect.width = max(nc->rect.width, 75);
- nc->rect.height = max(nc->rect.height, 50);
+
+ /* 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);
+ }
+
/* add pixels for the decoration */
/* TODO: don’t add them when the user automatically puts new windows into
* 1pixel/borderless mode */
/* 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, DONT_KILL_WINDOW, 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_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);
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.