mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-11-22 13:52:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed COL_MAX handling

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-03-01 16:59:42 +01:00
parent b5b125e8a9
commit 0a87eed676
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/wm/column.c
View File

@ -25,10 +25,10 @@ str2colmode(char *arg)
{
if(!strncmp("equal", arg, 6))
return COL_EQUAL;
else if(!strncmp("stack", arg, 6))
return COL_STACK;
else if(!strncmp("max", arg, 4))
if(!strncmp("stack", arg, 6))
return COL_STACK;
if(!strncmp("max", arg, 4))
return COL_MAX;
return -1;
}
@ -86,12 +86,16 @@ arrange_column(Area *col)
/* some relaxing due to potential increment gaps */
h = w = 0;
for(i = 0; i < col->nclient; i++) {
h += col->client[i]->frame.rect.height;
if(w < col->client[i]->frame.rect.width)
w = col->client[i]->frame.rect.width;
Client *c = col->client[i];
if(col->mode == COL_MAX) {
if(h < c->frame.rect.height)
h = c->frame.rect.height;
}
else
h += c->frame.rect.height;
if(w < c->frame.rect.width)
w = c->frame.rect.width;
}
if(col->mode == COL_MAX)
h = col->client[i]->frame.rect.height;
hdiff = (col->rect.height - h) / col->nclient;
wdiff = (col->rect.width - w) / 2;
@ -100,7 +104,8 @@ arrange_column(Area *col)
Client *c = col->client[i];
c->frame.rect.x += wdiff;
c->frame.rect.y = yoff;
yoff = c->frame.rect.y + c->frame.rect.height + hdiff;
if(col->mode != COL_MAX)
yoff = c->frame.rect.y + c->frame.rect.height + hdiff;
resize_client(c, &c->frame.rect, 0, False);
}
}

2
rc/wmiirc
View File

@ -130,7 +130,7 @@ do
$MODKEY-Control-a)
`proglist CONFPREFIX/wmii-3:$HOME/.wmii-3 | wmiimenu` &;;
$MODKEY-t)
extern xterm &;;
extern xterm -rv&;;
$MODKEY-n)
wmiir read /sel/new >/dev/null;;
$MODKEY-Shift-m)