*/
#include "dwm.h"
+#define MINDIM 100
+
/* static */
static Client *
c->h = sh - 2 * BORDERPX - bh;
}
else if(i == 0) { /* master window */
+ c->x = sx;
+ if(stackpos == StackLeft)
+ c->x += stackw;
+ c->y = sy + bh;
switch(stackpos) {
case StackLeft:
- c->x = sx + stackw;
- c->y = sy + bh;
+ case StackRight:
c->w = master - 2 * BORDERPX;
c->h = sh - bh - 2 * BORDERPX;
break;
case StackBottom:
- c->x = sx;
- c->y = sy + bh;
c->w = sw - 2 * BORDERPX;
c->h = master - 2 * BORDERPX;
break;
- case StackRight:
- c->x = sx;
- c->y = sy + bh;
- c->w = master - 2 * BORDERPX;
- c->h = sh - bh - 2 * BORDERPX;
- break;
}
}
- else if(th > bh) {
- /* tile window */
+ else if(th > bh) { /* tile window */
+ c->x = sx;
+ if(stackpos == StackRight)
+ c->x += master;
c->w = tw - 2 * BORDERPX;
c->h = th - 2 * BORDERPX;
switch(stackpos) {
case StackLeft:
- c->x = sx;
+ case StackRight:
c->y = sy + (i - 1) * th + bh;
if(i + 1 == n)
c->h = sh - c->y - 2 * BORDERPX;
break;
case StackBottom:
- c->x = sx;
c->y = sy + master + (i - 1) * th + bh;
if(i + 1 == n)
c->h = sh - c->y - 2 * BORDERPX;
break;
- case StackRight:
- c->x = sx + master;
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- break;
}
}
else { /* fallback if th < bh */
+ c->x = sx;
+ if(stackpos == StackRight)
+ c->x += master;
+ c->y = sy + bh;
+ if(stackpos == StackBottom)
+ c->y += master;
c->w = stackw - 2 * BORDERPX;
c->h = stackh - 2 * BORDERPX;
- switch(stackpos) {
- case StackLeft:
- c->x = sx;
- c->y = sy + bh;
- break;
- case StackBottom:
- c->x = sx;
- c->y = sy + master;
- break;
- case StackRight:
- c->x = sx + master;
- c->y = sy + bh;
- break;
- }
}
resize(c, False, TopLeft);
i++;
void
resizecol(Arg *arg) {
+ int s;
unsigned int n;
Client *c;
if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
return;
+ s = stackpos == StackBottom ? sh - bh : sw;
if(sel == getnext(clients)) {
- if(master + arg->i > sw - MINW || master + arg->i < MINW)
+ if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
return;
master += arg->i;
}
else {
- if(master - arg->i > sw - MINW || master - arg->i < MINW)
+ if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
return;
master -= arg->i;
}
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->twin);
}
- if(arrange != dofloat)
+ if(arrange != dofloat) {
+ if(!sel->isfloat) {
+ XLowerWindow(dpy, sel->twin);
+ XLowerWindow(dpy, sel->win);
+ }
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ if(c == sel)
+ continue;
XLowerWindow(dpy, c->twin);
XLowerWindow(dpy, c->win);
}
+ }
drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
stackpos = STACKPOS;
else
stackpos = StackBottom;
- updatemaster();
- arrange(NULL);
-}
-
-void
-updatemaster(void) {
master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+ arrange(NULL);
}
void