2012-08-07 03:55:52 -04:00
|
|
|
|
#line 2 "render.c"
|
2010-03-27 10:25:51 -04:00
|
|
|
|
/*
|
|
|
|
|
* vim:ts=4:sw=4:expandtab
|
2011-10-22 18:40:02 -04:00
|
|
|
|
*
|
|
|
|
|
* i3 - an improved dynamic tiling window manager
|
|
|
|
|
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
|
|
|
|
|
*
|
|
|
|
|
* render.c: Renders (determines position/sizes) the layout tree, updating the
|
|
|
|
|
* various rects. Needs to be pushed to X11 (see x.c) to be visible.
|
|
|
|
|
*
|
2010-03-27 10:25:51 -04:00
|
|
|
|
*/
|
|
|
|
|
#include "all.h"
|
|
|
|
|
|
2010-11-12 13:37:32 -05:00
|
|
|
|
/* change this to 'true' if you want to have additional borders around every
|
|
|
|
|
* container (for debugging purposes) */
|
|
|
|
|
static bool show_debug_borders = false;
|
|
|
|
|
|
2011-02-20 17:43:03 -05:00
|
|
|
|
/*
|
|
|
|
|
* 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;
|
|
|
|
|
|
2011-02-20 18:40:35 -05:00
|
|
|
|
/* 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) */
|
2011-06-10 12:27:20 -04:00
|
|
|
|
Con *ws = con_get_fullscreen_con(content, CF_OUTPUT);
|
|
|
|
|
Con *fullscreen = con_get_fullscreen_con(ws, CF_OUTPUT);
|
2011-02-20 18:40:35 -05:00
|
|
|
|
if (fullscreen) {
|
|
|
|
|
fullscreen->rect = con->rect;
|
|
|
|
|
x_raise_con(fullscreen);
|
|
|
|
|
render_con(fullscreen, true);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-20 17:43:03 -05:00
|
|
|
|
/* 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;
|
|
|
|
|
|
|
|
|
|
height -= child->rect.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);
|
|
|
|
|
x_raise_con(child);
|
|
|
|
|
render_con(child, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-27 10:25:51 -04:00
|
|
|
|
/*
|
|
|
|
|
* "Renders" the given container (and its children), meaning that all rects are
|
|
|
|
|
* updated correctly. Note that this function does not call any xcb_*
|
|
|
|
|
* functions, so the changes are completely done in memory only (and
|
|
|
|
|
* side-effect free). As soon as you call x_push_changes(), the changes will be
|
|
|
|
|
* updated in X11.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-11-21 11:00:10 -05:00
|
|
|
|
void render_con(Con *con, bool render_fullscreen) {
|
2010-11-13 08:55:11 -05:00
|
|
|
|
int children = con_num_children(con);
|
Introduce splith/splitv layouts, remove orientation
With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.
The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").
To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.
The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.
As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).
AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).
Fixes #464
2012-08-03 21:04:00 -04:00
|
|
|
|
DLOG("Rendering %snode %p / %s / layout %d / children %d\n",
|
2011-10-22 19:15:13 -04:00
|
|
|
|
(render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout,
|
Introduce splith/splitv layouts, remove orientation
With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.
The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").
To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.
The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.
As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).
AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).
Fixes #464
2012-08-03 21:04:00 -04:00
|
|
|
|
children);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
|
|
|
|
|
/* Copy container rect, subtract container border */
|
|
|
|
|
/* This is the actually usable space inside this container for clients */
|
|
|
|
|
Rect rect = con->rect;
|
2010-11-12 13:37:32 -05:00
|
|
|
|
|
|
|
|
|
/* Display a border if this is a leaf node. For container nodes, we don’t
|
|
|
|
|
* draw borders (except when in debug mode) */
|
|
|
|
|
if (show_debug_borders) {
|
|
|
|
|
rect.x += 2;
|
|
|
|
|
rect.y += 2;
|
|
|
|
|
rect.width -= 2 * 2;
|
|
|
|
|
rect.height -= 2 * 2;
|
|
|
|
|
}
|
2010-03-27 10:25:51 -04:00
|
|
|
|
|
|
|
|
|
int x = rect.x;
|
|
|
|
|
int y = rect.y;
|
|
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
con->mapped = true;
|
|
|
|
|
|
2010-04-13 14:51:43 -04:00
|
|
|
|
/* if this container contains a window, set the coordinates */
|
|
|
|
|
if (con->window) {
|
|
|
|
|
/* depending on the border style, the rect of the child window
|
|
|
|
|
* needs to be smaller */
|
|
|
|
|
Rect *inset = &(con->window_rect);
|
2010-11-12 15:41:10 -05:00
|
|
|
|
*inset = (Rect){0, 0, con->rect.width, con->rect.height};
|
2010-11-21 11:00:10 -05:00
|
|
|
|
if (!render_fullscreen)
|
|
|
|
|
*inset = rect_add(*inset, con_border_style_rect(con));
|
2010-10-11 15:32:04 -04:00
|
|
|
|
|
2010-11-14 17:44:13 -05:00
|
|
|
|
/* Obey x11 border */
|
|
|
|
|
inset->width -= (2 * con->border_width);
|
|
|
|
|
inset->height -= (2 * con->border_width);
|
|
|
|
|
|
2012-01-21 08:29:06 -05:00
|
|
|
|
/* 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->proportional_height != 0 &&
|
2010-10-11 15:32:04 -04:00
|
|
|
|
con->proportional_width != 0) {
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
if (new_height > inset->height)
|
|
|
|
|
new_width--;
|
|
|
|
|
}
|
|
|
|
|
/* Center the window */
|
|
|
|
|
inset->y += ceil(inset->height / 2) - floor(new_height / 2);
|
|
|
|
|
inset->x += ceil(inset->width / 2) - floor(new_width / 2);
|
|
|
|
|
|
|
|
|
|
inset->height = new_height;
|
|
|
|
|
inset->width = new_width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (con->height_increment > 1) {
|
|
|
|
|
int old_height = inset->height;
|
|
|
|
|
inset->height -= (inset->height - con->base_height) % con->height_increment;
|
|
|
|
|
DLOG("Lost %d pixel due to client's height_increment (%d px, base_height = %d)\n",
|
|
|
|
|
old_height - inset->height, con->height_increment, con->base_height);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (con->width_increment > 1) {
|
|
|
|
|
int old_width = inset->width;
|
|
|
|
|
inset->width -= (inset->width - con->base_width) % con->width_increment;
|
|
|
|
|
DLOG("Lost %d pixel due to client's width_increment (%d px, base_width = %d)\n",
|
|
|
|
|
old_width - inset->width, con->width_increment, con->base_width);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DLOG("child will be at %dx%d with size %dx%d\n", inset->x, inset->y, inset->width, inset->height);
|
2010-04-13 14:51:43 -04:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-27 10:25:51 -04:00
|
|
|
|
/* Check for fullscreen nodes */
|
2011-06-10 12:27:20 -04:00
|
|
|
|
Con *fullscreen = NULL;
|
|
|
|
|
if (con->type != CT_OUTPUT) {
|
|
|
|
|
fullscreen = con_get_fullscreen_con(con, (con->type == CT_ROOT ? CF_GLOBAL : CF_OUTPUT));
|
|
|
|
|
}
|
2010-03-27 10:25:51 -04:00
|
|
|
|
if (fullscreen) {
|
|
|
|
|
fullscreen->rect = rect;
|
2010-07-11 17:40:50 -04:00
|
|
|
|
x_raise_con(fullscreen);
|
2010-11-21 11:00:10 -05:00
|
|
|
|
render_con(fullscreen, true);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-14 18:25:37 -05:00
|
|
|
|
/* find the height for the decorations */
|
2011-11-13 18:23:25 -05:00
|
|
|
|
int deco_height = config.font.height + 4;
|
|
|
|
|
if (config.font.height & 0x01)
|
|
|
|
|
++deco_height;
|
2010-11-14 18:25:37 -05:00
|
|
|
|
|
2010-11-29 17:11:18 -05:00
|
|
|
|
/* precalculate the sizes to be able to correct rounding errors */
|
|
|
|
|
int sizes[children];
|
Introduce splith/splitv layouts, remove orientation
With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.
The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").
To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.
The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.
As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).
AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).
Fixes #464
2012-08-03 21:04:00 -04:00
|
|
|
|
if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && children > 0) {
|
2011-02-25 19:21:48 -05:00
|
|
|
|
assert(!TAILQ_EMPTY(&con->nodes_head));
|
2010-11-29 17:11:18 -05:00
|
|
|
|
Con *child;
|
|
|
|
|
int i = 0, assigned = 0;
|
Introduce splith/splitv layouts, remove orientation
With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.
The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").
To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.
The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.
As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).
AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).
Fixes #464
2012-08-03 21:04:00 -04:00
|
|
|
|
int total = con_orientation(con) == HORIZ ? rect.width : rect.height;
|
2010-11-29 17:11:18 -05:00
|
|
|
|
TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
|
|
|
|
|
double percentage = child->percent > 0.0 ? child->percent : 1.0 / children;
|
|
|
|
|
assigned += sizes[i++] = percentage * total;
|
|
|
|
|
}
|
2011-01-25 18:47:37 -05:00
|
|
|
|
assert(assigned == total ||
|
|
|
|
|
(assigned > total && assigned - total <= children * 2) ||
|
|
|
|
|
(assigned < total && total - assigned <= children * 2));
|
2011-01-22 12:54:49 -05:00
|
|
|
|
int signal = assigned < total ? 1 : -1;
|
|
|
|
|
while (assigned != total) {
|
2011-01-25 18:47:37 -05:00
|
|
|
|
for (i = 0; i < children && assigned != total; ++i) {
|
2011-01-22 12:54:49 -05:00
|
|
|
|
sizes[i] += signal;
|
|
|
|
|
assigned += signal;
|
2010-11-29 17:11:18 -05:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-20 17:43:03 -05:00
|
|
|
|
if (con->layout == L_OUTPUT) {
|
2011-12-21 18:15:32 -05:00
|
|
|
|
/* Skip i3-internal outputs */
|
|
|
|
|
if (con->name[0] == '_' && con->name[1] == '_')
|
|
|
|
|
return;
|
2011-02-20 17:43:03 -05:00
|
|
|
|
render_l_output(con);
|
2011-06-10 12:27:20 -04:00
|
|
|
|
} else if (con->type == CT_ROOT) {
|
2011-11-10 15:30:51 -05:00
|
|
|
|
Con *output;
|
|
|
|
|
TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
|
|
|
|
|
render_con(output, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We need to render floating windows after rendering all outputs’
|
|
|
|
|
* tiling windows because they need to be on top of *every* output at
|
|
|
|
|
* all times. This is important when the user places floating
|
|
|
|
|
* windows/containers so that they overlap on another output. */
|
|
|
|
|
DLOG("Rendering floating windows:\n");
|
|
|
|
|
TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
|
2011-12-21 18:15:32 -05:00
|
|
|
|
if (output->name[0] == '_' && output->name[1] == '_')
|
|
|
|
|
continue;
|
2011-11-10 15:30:51 -05:00
|
|
|
|
/* Get the active workspace of that output */
|
|
|
|
|
Con *content = output_get_content(output);
|
|
|
|
|
Con *workspace = TAILQ_FIRST(&(content->focus_head));
|
|
|
|
|
|
2011-11-21 18:04:49 -05:00
|
|
|
|
/* Check for (floating!) fullscreen nodes */
|
|
|
|
|
/* XXX: This code duplication is unfortunate. Keep in mind to fix
|
|
|
|
|
* this when we clean up the whole render.c */
|
|
|
|
|
Con *fullscreen = NULL;
|
|
|
|
|
fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
|
|
|
|
|
if (fullscreen) {
|
|
|
|
|
/* Either the fullscreen window is inside the floating
|
|
|
|
|
* container, then we need to render and raise it now… */
|
|
|
|
|
if (con_inside_floating(fullscreen)) {
|
|
|
|
|
fullscreen->rect = output->rect;
|
|
|
|
|
x_raise_con(fullscreen);
|
|
|
|
|
render_con(fullscreen, true);
|
|
|
|
|
continue;
|
|
|
|
|
} else {
|
|
|
|
|
/* …or it’s a tiling window, in which case the floating
|
|
|
|
|
* windows should not overlap it, so we skip rendering this
|
|
|
|
|
* output. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-10 15:30:51 -05:00
|
|
|
|
Con *child;
|
|
|
|
|
TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
|
|
|
|
|
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);
|
|
|
|
|
}
|
2011-06-10 12:27:20 -04:00
|
|
|
|
}
|
2011-11-10 15:30:51 -05:00
|
|
|
|
|
2011-02-20 17:43:03 -05:00
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
/* FIXME: refactor this into separate functions: */
|
2010-11-13 08:55:11 -05:00
|
|
|
|
Con *child;
|
2010-03-27 10:25:51 -04:00
|
|
|
|
TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
|
2011-02-25 19:21:48 -05:00
|
|
|
|
assert(children > 0);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
|
|
|
|
|
/* default layout */
|
Introduce splith/splitv layouts, remove orientation
With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.
The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").
To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.
The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.
As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).
AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).
Fixes #464
2012-08-03 21:04:00 -04:00
|
|
|
|
if (con->layout == L_SPLITH || con->layout == L_SPLITV) {
|
|
|
|
|
if (con->layout == L_SPLITH) {
|
2010-03-27 10:25:51 -04:00
|
|
|
|
child->rect.x = x;
|
|
|
|
|
child->rect.y = y;
|
2010-11-29 17:11:18 -05:00
|
|
|
|
child->rect.width = sizes[i];
|
2010-03-27 10:25:51 -04:00
|
|
|
|
child->rect.height = rect.height;
|
|
|
|
|
x += child->rect.width;
|
|
|
|
|
} else {
|
|
|
|
|
child->rect.x = x;
|
|
|
|
|
child->rect.y = y;
|
|
|
|
|
child->rect.width = rect.width;
|
2010-11-29 17:11:18 -05:00
|
|
|
|
child->rect.height = sizes[i];
|
2010-03-27 10:25:51 -04:00
|
|
|
|
y += child->rect.height;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* first we have the decoration, if this is a leaf node */
|
2010-11-12 13:37:43 -05:00
|
|
|
|
if (con_is_leaf(child) && child->border_style == BS_NORMAL) {
|
2010-03-27 10:25:51 -04:00
|
|
|
|
/* 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;
|
|
|
|
|
|
2010-11-14 18:25:37 -05:00
|
|
|
|
child->rect.y += deco_height;
|
|
|
|
|
child->rect.height -= deco_height;
|
2010-03-27 10:25:51 -04:00
|
|
|
|
|
|
|
|
|
child->deco_rect.width = child->rect.width;
|
2010-11-14 18:25:37 -05:00
|
|
|
|
child->deco_rect.height = deco_height;
|
2010-03-27 10:25:51 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-14 18:38:53 -05:00
|
|
|
|
/* stacked layout */
|
|
|
|
|
else if (con->layout == L_STACKED) {
|
2010-03-27 10:25:51 -04:00
|
|
|
|
child->rect.x = x;
|
|
|
|
|
child->rect.y = y;
|
|
|
|
|
child->rect.width = rect.width;
|
|
|
|
|
child->rect.height = rect.height;
|
|
|
|
|
|
|
|
|
|
child->deco_rect.x = x - con->rect.x;
|
2010-11-14 18:25:37 -05:00
|
|
|
|
child->deco_rect.y = y - con->rect.y + (i * deco_height);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
child->deco_rect.width = child->rect.width;
|
2010-11-14 18:25:37 -05:00
|
|
|
|
child->deco_rect.height = deco_height;
|
2011-01-17 08:38:16 -05:00
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
2010-03-27 10:25:51 -04:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-14 18:38:53 -05:00
|
|
|
|
/* tabbed layout */
|
|
|
|
|
else if (con->layout == L_TABBED) {
|
|
|
|
|
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;
|
|
|
|
|
|
2010-12-28 13:54:56 -05:00
|
|
|
|
if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
|
|
|
|
|
child->rect.y += deco_height;
|
|
|
|
|
child->rect.height -= deco_height;
|
|
|
|
|
}
|
2010-11-14 18:38:53 -05:00
|
|
|
|
}
|
|
|
|
|
|
2011-02-20 17:43:03 -05:00
|
|
|
|
/* dockarea layout */
|
|
|
|
|
else if (con->layout == L_DOCKAREA) {
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-07 14:58:58 -05:00
|
|
|
|
DLOG("child at (%d, %d) with (%d x %d)\n",
|
2010-03-27 10:25:51 -04:00
|
|
|
|
child->rect.x, child->rect.y, child->rect.width, child->rect.height);
|
|
|
|
|
x_raise_con(child);
|
2010-11-21 11:00:10 -05:00
|
|
|
|
render_con(child, false);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-14 18:38:53 -05:00
|
|
|
|
/* in a stacking or tabbed container, we ensure the focused client is raised */
|
|
|
|
|
if (con->layout == L_STACKED || con->layout == L_TABBED) {
|
2011-03-06 15:49:17 -05:00
|
|
|
|
TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
|
|
|
|
|
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
|
|
|
|
|
* aswell. */
|
|
|
|
|
render_con(child, false);
|
2010-11-13 16:39:59 -05:00
|
|
|
|
}
|
2011-07-10 14:05:49 -04:00
|
|
|
|
|
2011-07-11 17:17:56 -04:00
|
|
|
|
if (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). */
|
|
|
|
|
x_raise_con(con);
|
2010-03-27 10:25:51 -04:00
|
|
|
|
}
|
2011-02-20 17:43:03 -05:00
|
|
|
|
}
|
2010-03-27 10:25:51 -04:00
|
|
|
|
}
|