* container (for debugging purposes) */
static bool show_debug_borders = false;
+/*
+ * Returns the height for the decorations
+ */
+int render_deco_height(void) {
+ int deco_height = config.font.height + 4;
+ if (config.font.height & 0x01)
+ ++deco_height;
+ return deco_height;
+}
+
/*
* Renders a container with layout L_OUTPUT. In this layout, all CT_DOCKAREAs
* get the height of their content and the remaining CT_CON gets the rest.
Con *fullscreen = con_get_fullscreen_con(ws, CF_OUTPUT);
if (fullscreen) {
fullscreen->rect = con->rect;
- x_raise_con(fullscreen);
+ x_raise_con(fullscreen, true);
render_con(fullscreen, true);
return;
}
DLOG("child at (%d, %d) with (%d x %d)\n",
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
- x_raise_con(child);
+ x_raise_con(child, false);
render_con(child, false);
}
}
* Ignoring aspect ratio during fullscreen was necessary to fix MPlayer
* subtitle rendering, see http://bugs.i3wm.org/594 */
if (!render_fullscreen &&
- con->proportional_height != 0 &&
- con->proportional_width != 0) {
+ con->aspect_ratio > 0.0) {
+ DLOG("aspect_ratio = %f, current width/height are %d/%d\n",
+ con->aspect_ratio, inset->width, inset->height);
double new_height = inset->height + 1;
int new_width = inset->width;
while (new_height > inset->height) {
- new_height = ((double)con->proportional_height / con->proportional_width) * new_width;
+ new_height = (1.0 / con->aspect_ratio) * new_width;
if (new_height > inset->height)
new_width--;
}
/* Center the window */
- inset->y += ceil(inset->height / 2) - floor(new_height / 2);
+ inset->y += ceil(inset->height / 2) - floor((new_height + .5) / 2);
inset->x += ceil(inset->width / 2) - floor(new_width / 2);
- inset->height = new_height;
+ inset->height = new_height + .5;
inset->width = new_width;
}
}
if (fullscreen) {
fullscreen->rect = rect;
- x_raise_con(fullscreen);
+ x_raise_con(fullscreen, false);
render_con(fullscreen, true);
return;
}
/* find the height for the decorations */
- int deco_height = config.font.height + 4;
- if (config.font.height & 0x01)
- ++deco_height;
+ int deco_height = render_deco_height();
/* precalculate the sizes to be able to correct rounding errors */
int sizes[children];
/* Don’t render floating windows when there is a fullscreen window
* on that workspace. Necessary to make floating fullscreen work
* correctly (ticket #564). */
- if (fullscreen != NULL) {
+ if (fullscreen != NULL && fullscreen->window != NULL) {
Con *floating_child = con_descend_focused(child);
+ Con *transient_con = floating_child;
+ bool is_transient_for = false;
/* Exception to the above rule: smart
* popup_during_fullscreen handling (popups belonging to
* the fullscreen app will be rendered). */
- if (floating_child->window == NULL ||
- fullscreen->window == NULL ||
- floating_child->window->transient_for != fullscreen->window->id)
+ while (transient_con != NULL &&
+ transient_con->window != NULL &&
+ transient_con->window->transient_for != XCB_NONE) {
+ if (transient_con->window->transient_for == fullscreen->window->id) {
+ is_transient_for = true;
+ break;
+ }
+ transient_con = con_by_window_id(transient_con->window->transient_for);
+ }
+
+ if (!is_transient_for)
continue;
else {
DLOG("Rendering floating child even though in fullscreen mode: "
- "floating->transient_for (0x%08x) == fullscreen->id (0x%08x)\n",
+ "floating->transient_for (0x%08x) --> fullscreen->id (0x%08x)\n",
floating_child->window->transient_for, fullscreen->window->id);
}
}
DLOG("floating child at (%d,%d) with %d x %d\n",
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
- x_raise_con(child);
+ x_raise_con(child, false);
render_con(child, false);
}
}
child->rect.width = rect.width;
child->rect.height = rect.height;
- child->deco_rect.width = ceil((float)child->rect.width / children);
+ child->deco_rect.width = floor((float)child->rect.width / children);
child->deco_rect.x = x - con->rect.x + i * child->deco_rect.width;
child->deco_rect.y = y - con->rect.y;
+ /* Since the tab width may be something like 31,6 px per tab, we
+ * let the last tab have all the extra space (0,6 * children). */
+ if (i == (children-1)) {
+ child->deco_rect.width += (child->rect.width - (child->deco_rect.x + child->deco_rect.width));
+ }
+
if (children > 1 || (child->border_style != BS_PIXEL && child->border_style != BS_NONE)) {
child->rect.y += deco_height;
child->rect.height -= deco_height;
DLOG("child at (%d, %d) with (%d x %d)\n",
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
- x_raise_con(child);
+ x_raise_con(child, false);
render_con(child, false);
i++;
}
/* in a stacking or tabbed container, we ensure the focused client is raised */
if (con->layout == L_STACKED || con->layout == L_TABBED) {
TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
- x_raise_con(child);
+ x_raise_con(child, false);
if ((child = TAILQ_FIRST(&(con->focus_head)))) {
/* By rendering the stacked container again, we handle the case
* that we have a non-leaf-container inside the stack. In that
* top of every stack window. That way, when a new window is opened in
* the stack, the old window will not obscure part of the decoration
* (it’s unmapped afterwards). */
- x_raise_con(con);
+ x_raise_con(con, false);
}
}
}
projects / i3 / i3 / blobdiff