-#undef I3__FILE__
-#define I3__FILE__ "render.c"
/*
* vim:ts=4:sw=4:expandtab
*
* updated in X11.
*
*/
-void render_con(Con *con, bool render_fullscreen) {
+void render_con(Con *con) {
render_params params = {
.rect = con->rect,
.x = con->rect.x,
.y = con->rect.y,
.children = con_num_children(con)};
- DLOG("Rendering %snode %p / %s / layout %d / children %d\n",
- (render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout,
- params.children);
+ DLOG("Rendering node %p / %s / layout %d / children %d\n", con, con->name,
+ con->layout, params.children);
int i = 0;
con->mapped = true;
* needs to be smaller */
Rect *inset = &(con->window_rect);
*inset = (Rect){0, 0, con->rect.width, con->rect.height};
- if (!render_fullscreen)
+ if (con->fullscreen_mode == CF_NONE) {
*inset = rect_add(*inset, con_border_style_rect(con));
+ }
/* Obey x11 border */
inset->width -= (2 * con->border_width);
inset->height -= (2 * con->border_width);
- /* Obey the aspect ratio, if any, unless we are in fullscreen mode.
- *
- * The spec isn’t explicit on whether the aspect ratio hints should be
- * respected during fullscreen mode. Other WMs such as Openbox don’t do
- * that, and this post suggests that this is the correct way to do it:
- * http://mail.gnome.org/archives/wm-spec-list/2003-May/msg00007.html
- *
- * Ignoring aspect ratio during fullscreen was necessary to fix MPlayer
- * subtitle rendering, see http://bugs.i3wm.org/594 */
- if (!render_fullscreen && con->window->aspect_ratio > 0.0) {
- DLOG("aspect_ratio = %f, current width/height are %d/%d\n",
- con->window->aspect_ratio, inset->width, inset->height);
- double new_height = inset->height + 1;
- int new_width = inset->width;
-
- while (new_height > inset->height) {
- new_height = (1.0 / con->window->aspect_ratio) * new_width;
-
- if (new_height > inset->height)
- new_width--;
- }
- /* Center the window */
- 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 + .5;
- inset->width = new_width;
- }
-
/* NB: We used to respect resize increment size hints for tiling
* windows up until commit 0db93d9 here. However, since all terminal
* emulators cope with ignoring the size hints in a better way than we
* can (by providing their fake-transparency or background color), this
- * code was removed. See also http://bugs.i3wm.org/540 */
+ * code was removed. See also https://bugs.i3wm.org/540 */
DLOG("child will be at %dx%d with size %dx%d\n", inset->x, inset->y, inset->width, inset->height);
}
if (fullscreen) {
fullscreen->rect = params.rect;
x_raise_con(fullscreen);
- render_con(fullscreen, true);
+ render_con(fullscreen);
/* Fullscreen containers are either global (underneath the CT_ROOT
* container) or per-output (underneath the CT_CONTENT container). For
* global fullscreen containers, we cannot abort rendering here yet,
* because the floating windows (with popup_during_fullscreen smart)
* have not yet been rendered (see the CT_ROOT code path below). See
- * also http://bugs.i3wm.org/1393 */
+ * also https://bugs.i3wm.org/1393 */
if (con->type != CT_ROOT) {
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);
- render_con(child, false);
+ render_con(child);
i++;
}
x_raise_con(child);
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
- * case, the children of the non-leaf-container need to be raised
- * as well. */
- render_con(child, false);
+ * that we have a non-leaf-container inside the stack. In that
+ * case, the children of the non-leaf-container need to be
+ * raised as well. */
+ render_con(child);
}
if (params.children != 1)
- /* Raise the stack con itself. This will put the stack decoration on
- * 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). */
+ /* Raise the stack con itself. This will put the stack
+ * decoration on 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);
}
}
}
static int *precalculate_sizes(Con *con, render_params *p) {
+ if ((con->layout != L_SPLITH && con->layout != L_SPLITV) || p->children <= 0) {
+ return NULL;
+ }
+
int *sizes = smalloc(p->children * sizeof(int));
- if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && p->children > 0) {
- assert(!TAILQ_EMPTY(&con->nodes_head));
+ assert(!TAILQ_EMPTY(&con->nodes_head));
- Con *child;
- int i = 0, assigned = 0;
- int total = con_orientation(con) == HORIZ ? p->rect.width : p->rect.height;
- TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
- double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children;
- assigned += sizes[i++] = percentage * total;
- }
- assert(assigned == total ||
- (assigned > total && assigned - total <= p->children * 2) ||
- (assigned < total && total - assigned <= p->children * 2));
- int signal = assigned < total ? 1 : -1;
- while (assigned != total) {
- for (i = 0; i < p->children && assigned != total; ++i) {
- sizes[i] += signal;
- assigned += signal;
- }
+ Con *child;
+ int i = 0, assigned = 0;
+ int total = con_rect_size_in_orientation(con);
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children;
+ assigned += sizes[i++] = lround(percentage * total);
+ }
+ assert(assigned == total ||
+ (assigned > total && assigned - total <= p->children * 2) ||
+ (assigned < total && total - assigned <= p->children * 2));
+ int signal = assigned < total ? 1 : -1;
+ while (assigned != total) {
+ for (i = 0; i < p->children && assigned != total; ++i) {
+ sizes[i] += signal;
+ assigned += signal;
}
}
Con *output;
if (!fullscreen) {
TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
- render_con(output, false);
+ render_con(output);
}
}
continue;
}
Con *workspace = TAILQ_FIRST(&(content->focus_head));
- Con *fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
+ Con *fullscreen = con_get_fullscreen_covering_ws(workspace);
Con *child;
TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
- /* Don’t render floating windows when there is a fullscreen window
- * on that workspace. Necessary to make floating fullscreen work
- * correctly (ticket #564). */
- /* If there is no fullscreen->window, this cannot be a
- * transient window, so we _know_ we need to skip it. This
- * happens during restarts where the container already exists,
- * but the window was not yet associated. */
- if (fullscreen != NULL && fullscreen->window == NULL)
- continue;
- if (fullscreen != NULL && fullscreen->window != NULL) {
+ if (fullscreen != NULL) {
+ /* Don’t render floating windows when there is a fullscreen
+ * window on that workspace. Necessary to make floating
+ * fullscreen work correctly (ticket #564). Exception to the
+ * above rule: smart popup_during_fullscreen handling (popups
+ * belonging to the fullscreen app will be rendered). */
+ if (config.popup_during_fullscreen != PDF_SMART || fullscreen->window == NULL) {
+ continue;
+ }
+
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). */
while (transient_con != NULL &&
transient_con->window != NULL &&
transient_con->window->transient_for != XCB_NONE) {
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);
- render_con(child, false);
+ render_con(child);
}
}
}
if (fullscreen) {
fullscreen->rect = con->rect;
x_raise_con(fullscreen);
- render_con(fullscreen, true);
+ render_con(fullscreen);
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);
- render_con(child, false);
+ render_con(child);
}
}
projects / i3 / i3 / blobdiff