Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made the fair layout really fair 

The fair layout had the same issue as the slave columns in tiling layout
in that all strips were filled maximally with cells up to the last, and
the last strip may have significantly fewer cells than the other strips.
In my mind, that's not fair.  The new strategy makes sure the numbers of
cells in any two strips differ by no more than one.

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Norbert Zeh 2008-11-19 10:28:09 -04:00 committed by Julien Danjou
parent edd0ae73e2
commit 5302d707db
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
layouts/fair.c
View File

@ -30,8 +30,9 @@ extern awesome_t globalconf;
static void static void
layout_fair(int screen, const orientation_t orientation) layout_fair(int screen, const orientation_t orientation)
{ {
int u_divisions=1, v_divisions = 1, int strips=1, cells = 1,
u = 0, v = 0, n = 0; strip = 0, cell = 0, n = 0,
full_strips;
client_t *c; client_t *c;
area_t geometry, area; area_t geometry, area;
@ -46,10 +47,11 @@ layout_fair(int screen, const orientation_t orientation)
if(n > 0) if(n > 0)
{ {
while(u_divisions * u_divisions < n) while(cells * cells < n)
++u_divisions; ++cells;
v_divisions = (u_divisions * (u_divisions - 1) >= n) ? u_divisions - 1 : u_divisions; strips = (cells * (cells - 1) >= n) ? cells - 1 : cells;
full_strips = n - strips * (cells - 1);
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
if(IS_TILED(c, screen)) if(IS_TILED(c, screen))
@ -57,28 +59,28 @@ layout_fair(int screen, const orientation_t orientation)
if (((orientation == East) && (n > 2)) if (((orientation == East) && (n > 2))
|| ((orientation == South) && (n <= 2))) || ((orientation == South) && (n <= 2)))
{ {
geometry.width = area.width / u_divisions; geometry.width = area.width / cells;
geometry.height = area.height / v_divisions; geometry.height = area.height / strips;
geometry.x = area.x + u * geometry.width; geometry.x = area.x + cell * geometry.width;
geometry.y = area.y + v * geometry.height; geometry.y = area.y + strip * geometry.height;
} }
else else
{ {
geometry.width = area.width / v_divisions; geometry.width = area.width / strips;
geometry.height = area.height / u_divisions; geometry.height = area.height / cells;
geometry.x = area.x + v * geometry.width; geometry.x = area.x + strip * geometry.width;
geometry.y = area.y + u * geometry.height; geometry.y = area.y + cell * geometry.height;
} }
geometry.width -= 2 * c->border; geometry.width -= 2 * c->border;
geometry.height -= 2 * c->border; geometry.height -= 2 * c->border;
client_resize(c, geometry, c->honorsizehints); client_resize(c, geometry, c->honorsizehints);
if(++u == u_divisions) if(++cell == cells)
{ {
u = 0; cell = 0;
if(++v == v_divisions - 1) if(++strip == full_strips)
u_divisions = u_divisions - u_divisions * v_divisions + n; cells--;
} }
} }
} }