* container (for debugging purposes) */
static bool show_debug_borders = false;
+/*
+ * 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.
+ *
+ */
+static void render_l_output(Con *con) {
+ Con *child, *dockchild;
+
+ int x = con->rect.x;
+ int y = con->rect.y;
+ int height = con->rect.height;
+ DLOG("Available height: %d\n", height);
+
+ /* Find the content container and ensure that there is exactly one. Also
+ * check for any non-CT_DOCKAREA clients. */
+ Con *content = NULL;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ if (child->type == CT_CON) {
+ if (content != NULL) {
+ DLOG("More than one CT_CON on output container\n");
+ assert(false);
+ }
+ content = child;
+ } else if (child->type != CT_DOCKAREA) {
+ DLOG("Child %p of type %d is inside the OUTPUT con\n", child, child->type);
+ assert(false);
+ }
+ }
+
+ assert(content != NULL);
+
+ /* We need to find out if there is a fullscreen con on the current workspace
+ * and take the short-cut to render it directly (the user does not want to
+ * see the dockareas in that case) */
+ Con *ws = con_get_fullscreen_con(content);
+ Con *fullscreen = con_get_fullscreen_con(ws);
+ if (fullscreen) {
+ DLOG("got fs node: %p\n", fullscreen);
+ fullscreen->rect = con->rect;
+ x_raise_con(fullscreen);
+ render_con(fullscreen, true);
+ return;
+ }
+
+ /* First pass: determine the height of all CT_DOCKAREAs (the sum of their
+ * children) and figure out how many pixels we have left for the rest */
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ if (child->type != CT_DOCKAREA)
+ continue;
+
+ child->rect.height = 0;
+ TAILQ_FOREACH(dockchild, &(child->nodes_head), nodes)
+ child->rect.height += dockchild->geometry.height;
+ DLOG("This dockarea's height: %d\n", child->rect.height);
+
+ height -= child->rect.height;
+ }
+
+ DLOG("Remaining: %d\n", height);
+
+ /* Second pass: Set the widths/heights */
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ if (child->type == CT_CON) {
+ child->rect.x = x;
+ child->rect.y = y;
+ child->rect.width = con->rect.width;
+ child->rect.height = height;
+ }
+
+ child->rect.x = x;
+ child->rect.y = y;
+ child->rect.width = con->rect.width;
+
+ child->deco_rect.x = 0;
+ child->deco_rect.y = 0;
+ child->deco_rect.width = 0;
+ child->deco_rect.height = 0;
+
+ y += child->rect.height;
+
+ DLOG("child at (%d, %d) with (%d x %d)\n",
+ child->rect.x, child->rect.y, child->rect.width, child->rect.height);
+ DLOG("x now %d, y now %d\n", x, y);
+ x_raise_con(child);
+ render_con(child, false);
+ }
+}
+
/*
* "Renders" the given container (and its children), meaning that all rects are
* updated correctly. Note that this function does not call any xcb_*
*inset = rect_add(*inset, con_border_style_rect(con));
/* Obey x11 border */
+ DLOG("X11 border: %d\n", con->border_width);
inset->width -= (2 * con->border_width);
inset->height -= (2 * con->border_width);
}
/* Check for fullscreen nodes */
- Con *fullscreen = con_get_fullscreen_con(con);
+ Con *fullscreen = (con->type == CT_OUTPUT ? NULL : con_get_fullscreen_con(con));
if (fullscreen) {
DLOG("got fs node: %p\n", fullscreen);
fullscreen->rect = rect;
}
/* 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;
/* precalculate the sizes to be able to correct rounding errors */
int sizes[children];
if (con->layout == L_DEFAULT && children > 0) {
+ assert(!TAILQ_EMPTY(&con->nodes_head));
Con *child;
int i = 0, assigned = 0;
int total = con->orientation == HORIZ ? rect.width : rect.height;
double percentage = child->percent > 0.0 ? child->percent : 1.0 / children;
assigned += sizes[i++] = percentage * total;
}
+ assert(assigned == total ||
+ (assigned > total && assigned - total <= children * 2) ||
+ (assigned < total && total - assigned <= children * 2));
int signal = assigned < total ? 1 : -1;
while (assigned != total) {
- for (i = 0; i < children && assigned < total; ++i) {
+ for (i = 0; i < children && assigned != total; ++i) {
sizes[i] += signal;
assigned += signal;
}
}
}
+ if (con->layout == L_OUTPUT) {
+ render_l_output(con);
+ } else {
+
+ /* FIXME: refactor this into separate functions: */
Con *child;
TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ assert(children > 0);
/* default layout */
if (con->layout == L_DEFAULT) {
}
}
+ /* dockarea layout */
+ else if (con->layout == L_DOCKAREA) {
+ DLOG("dockarea con\n");
+ child->rect.x = x;
+ child->rect.y = y;
+ child->rect.width = rect.width;
+ child->rect.height = child->geometry.height;
+
+ child->deco_rect.x = 0;
+ child->deco_rect.y = 0;
+ child->deco_rect.width = 0;
+ child->deco_rect.height = 0;
+ y += child->rect.height;
+ }
+
DLOG("child at (%d, %d) with (%d x %d)\n",
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
DLOG("x now %d, y now %d\n", x, y);
/* in a stacking or tabbed container, we ensure the focused client is raised */
if (con->layout == L_STACKED || con->layout == L_TABBED) {
- Con *foc = TAILQ_FIRST(&(con->focus_head));
- if (foc != TAILQ_END(&(con->focus_head))) {
- DLOG("con %p is stacking, raising %p\n", con, foc);
- x_raise_con(foc);
- /* by rendering the stacked container again, we handle the case
- * that we have a non-leaf-container inside the stack. */
- render_con(foc, false);
+ DLOG("stacked/tabbed, raising focused reverse\n");
+ TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
+ x_raise_con(child);
+ DLOG("done\n");
+ if ((child = TAILQ_FIRST(&(con->focus_head)))) {
+ DLOG("con %p is stacking, raising %p\n", con, child);
+ /* 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
+ * aswell. */
+ render_con(child, false);
}
}
+ }
+ Con *child;
TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
DLOG("render floating:\n");
DLOG("floating child at (%d,%d) with %d x %d\n", child->rect.x, child->rect.y, child->rect.width, child->rect.height);