* 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);
+
+ /* 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) {
+ if (height == -1) {
+ DLOG("More than one CT_CON on output container\n");
+ assert(false);
+ }
+ child->rect.x = x;
+ child->rect.y = y;
+ child->rect.width = con->rect.width;
+ child->rect.height = height;
+ height = -1;
+ }
+
+ else if (child->type != CT_DOCKAREA) {
+ DLOG("Child %p of type %d is inside the OUTPUT con\n", child, child->type);
+ assert(false);
+ }
+
+ 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_*
* updated in X11.
*
*/
-void render_con(Con *con) {
- printf("currently rendering node %p / %s / layout %d\n",
+void render_con(Con *con, bool render_fullscreen) {
+ DLOG("currently rendering node %p / %s / layout %d\n",
con, con->name, con->layout);
int children = con_num_children(con);
- printf("children: %d, orientation = %d\n", children, con->orientation);
+ DLOG("children: %d, orientation = %d\n", children, con->orientation);
/* Copy container rect, subtract container border */
/* This is the actually usable space inside this container for clients */
int i = 0;
- printf("mapped = true\n");
con->mapped = true;
/* if this container contains a window, set the coordinates */
* needs to be smaller */
Rect *inset = &(con->window_rect);
*inset = (Rect){0, 0, con->rect.width, con->rect.height};
- *inset = rect_add(*inset, con_border_style_rect(con));
+ if (!render_fullscreen)
+ *inset = rect_add(*inset, con_border_style_rect(con));
/* Obey x11 border */
inset->width -= (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) {
- LOG("got fs node: %p\n", fullscreen);
+ DLOG("got fs node: %p\n", fullscreen);
fullscreen->rect = rect;
x_raise_con(fullscreen);
- render_con(fullscreen);
+ render_con(fullscreen, true);
return;
}
i3Font *font = load_font(conn, config.font);
int deco_height = font->height + 5;
+ /* precalculate the sizes to be able to correct rounding errors */
+ int sizes[children];
+ if (con->layout == L_DEFAULT && children > 0) {
+ Con *child;
+ int i = 0, assigned = 0;
+ int total = con->orientation == HORIZ ? rect.width : rect.height;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ 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) {
+ 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) {
/* default layout */
if (con->layout == L_DEFAULT) {
- double percentage = 1.0 / children;
- if (child->percent > 0.0)
- percentage = child->percent;
- printf("child %p / %s requests percentage %f\n",
- child, child->name, percentage);
-
if (con->orientation == HORIZ) {
child->rect.x = x;
child->rect.y = y;
- child->rect.width = percentage * rect.width;
+ child->rect.width = sizes[i];
child->rect.height = rect.height;
x += child->rect.width;
} else {
child->rect.x = x;
child->rect.y = y;
child->rect.width = rect.width;
- child->rect.height = percentage * rect.height;
+ child->rect.height = sizes[i];
y += child->rect.height;
}
/* first we have the decoration, if this is a leaf node */
if (con_is_leaf(child) && child->border_style == BS_NORMAL) {
- printf("that child is a leaf node, subtracting deco\n");
+ DLOG("that child is a leaf node, subtracting deco\n");
/* TODO: make a function for relative coords? */
child->deco_rect.x = child->rect.x - con->rect.x;
child->deco_rect.y = child->rect.y - con->rect.y;
}
}
- if (con->layout == L_STACKED) {
- printf("stacked con\n");
+ /* stacked layout */
+ else if (con->layout == L_STACKED) {
+ DLOG("stacked con\n");
child->rect.x = x;
child->rect.y = y;
child->rect.width = rect.width;
child->rect.height = rect.height;
- child->rect.y += (deco_height * children);
- child->rect.height -= (deco_height * children);
-
child->deco_rect.x = x - con->rect.x;
child->deco_rect.y = y - con->rect.y + (i * deco_height);
child->deco_rect.width = child->rect.width;
child->deco_rect.height = deco_height;
+
+ if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+ child->rect.y += (deco_height * children);
+ child->rect.height -= (deco_height * children);
+ }
+ }
+
+ /* tabbed layout */
+ else if (con->layout == L_TABBED) {
+ DLOG("tabbed con\n");
+ child->rect.x = x;
+ child->rect.y = y;
+ child->rect.width = rect.width;
+ child->rect.height = rect.height;
+
+ child->deco_rect.width = child->rect.width / children;
+ child->deco_rect.height = deco_height;
+ child->deco_rect.x = x - con->rect.x + i * child->deco_rect.width;
+ child->deco_rect.y = y - con->rect.y;
+
+ if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+ child->rect.y += deco_height;
+ child->rect.height -= deco_height;
+ }
+ }
+
+ /* 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;
}
- printf("child at (%d, %d) with (%d x %d)\n",
+ DLOG("child at (%d, %d) with (%d x %d)\n",
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
- printf("x now %d, y now %d\n", x, y);
+ DLOG("x now %d, y now %d\n", x, y);
x_raise_con(child);
- render_con(child);
+ render_con(child, false);
i++;
}
- /* in a stacking container, we ensure the focused client is raised */
- if (con->layout == L_STACKED) {
+ /* 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))) {
- LOG("con %p is stacking, raising %p\n", con, foc);
+ 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);
+ render_con(foc, false);
}
}
+ }
+ Con *child;
TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
- LOG("render floating:\n");
- LOG("floating child at (%d,%d) with %d x %d\n", child->rect.x, child->rect.y, child->rect.width, child->rect.height);
+ 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);
x_raise_con(child);
- render_con(child);
+ render_con(child, false);
}
- printf("-- level up\n");
+ DLOG("-- level up\n");
}
projects / i3 / i3 / blobdiff