|
|
@ -16,16 +16,16 @@ resizetitle(Client *c) |
|
|
|
{ |
|
|
|
int i; |
|
|
|
|
|
|
|
c->tw = 0; |
|
|
|
c->bw = 0; |
|
|
|
for(i = 0; i < TLast; i++) |
|
|
|
if(c->tags[i]) |
|
|
|
c->tw += textw(c->tags[i]); |
|
|
|
c->tw += textw(c->name); |
|
|
|
if(c->tw > c->w) |
|
|
|
c->tw = c->w + 2; |
|
|
|
c->tx = c->x + c->w - c->tw + 2; |
|
|
|
c->ty = c->y; |
|
|
|
XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th); |
|
|
|
c->bw += textw(c->tags[i]); |
|
|
|
c->bw += textw(c->name); |
|
|
|
if(c->bw > *c->w) |
|
|
|
c->bw = *c->w + 2; |
|
|
|
c->bx = *c->x + *c->w - c->bw + 2; |
|
|
|
c->by = *c->y; |
|
|
|
XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh); |
|
|
|
} |
|
|
|
|
|
|
|
static int |
|
|
@ -39,8 +39,8 @@ xerrordummy(Display *dsply, XErrorEvent *ee) |
|
|
|
void |
|
|
|
ban(Client *c) |
|
|
|
{ |
|
|
|
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); |
|
|
|
XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty); |
|
|
|
XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y); |
|
|
|
XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by); |
|
|
|
} |
|
|
|
|
|
|
|
void |
|
|
@ -124,12 +124,12 @@ gravitate(Client *c, Bool invert) |
|
|
|
case EastGravity: |
|
|
|
case CenterGravity: |
|
|
|
case WestGravity: |
|
|
|
dy = -(c->h / 2) + c->border; |
|
|
|
dy = -(*c->h / 2) + c->border; |
|
|
|
break; |
|
|
|
case SouthEastGravity: |
|
|
|
case SouthGravity: |
|
|
|
case SouthWestGravity: |
|
|
|
dy = -c->h; |
|
|
|
dy = -(*c->h); |
|
|
|
break; |
|
|
|
default: |
|
|
|
break; |
|
|
@ -145,12 +145,12 @@ gravitate(Client *c, Bool invert) |
|
|
|
case NorthGravity: |
|
|
|
case CenterGravity: |
|
|
|
case SouthGravity: |
|
|
|
dx = -(c->w / 2) + c->border; |
|
|
|
dx = -(*c->w / 2) + c->border; |
|
|
|
break; |
|
|
|
case NorthEastGravity: |
|
|
|
case EastGravity: |
|
|
|
case SouthEastGravity: |
|
|
|
dx = -(c->w + c->border); |
|
|
|
dx = -(*c->w + c->border); |
|
|
|
break; |
|
|
|
default: |
|
|
|
break; |
|
|
@ -160,8 +160,8 @@ gravitate(Client *c, Bool invert) |
|
|
|
dx = -dx; |
|
|
|
dy = -dy; |
|
|
|
} |
|
|
|
c->x += dx; |
|
|
|
c->y += dy; |
|
|
|
*c->x += dx; |
|
|
|
*c->y += dy; |
|
|
|
} |
|
|
|
|
|
|
|
void |
|
|
@ -198,13 +198,13 @@ manage(Window w, XWindowAttributes *wa) |
|
|
|
|
|
|
|
c = emallocz(sizeof(Client)); |
|
|
|
c->win = w; |
|
|
|
c->tx = c->x = wa->x; |
|
|
|
c->ty = c->y = wa->y; |
|
|
|
if(c->y < bh) |
|
|
|
c->ty = c->y += bh; |
|
|
|
c->tw = c->w = wa->width; |
|
|
|
c->h = wa->height; |
|
|
|
c->th = bh; |
|
|
|
c->bx = c->fx = c->tx = wa->x; |
|
|
|
c->by = c->fy = c->ty = wa->y; |
|
|
|
if(c->fy < bh) |
|
|
|
c->by = c->fy = c->ty += bh; |
|
|
|
c->bw = c->fw = c->tw = wa->width; |
|
|
|
c->fh = c->th = wa->height; |
|
|
|
c->bh = bh; |
|
|
|
c->border = 1; |
|
|
|
c->proto = getproto(c->win); |
|
|
|
setsize(c); |
|
|
@ -215,12 +215,11 @@ manage(Window w, XWindowAttributes *wa) |
|
|
|
twa.background_pixmap = ParentRelative; |
|
|
|
twa.event_mask = ExposureMask; |
|
|
|
|
|
|
|
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th, |
|
|
|
c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh, |
|
|
|
0, DefaultDepth(dpy, screen), CopyFromParent, |
|
|
|
DefaultVisual(dpy, screen), |
|
|
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); |
|
|
|
|
|
|
|
settitle(c); |
|
|
|
settags(c); |
|
|
|
|
|
|
|
c->next = clients; |
|
|
@ -239,7 +238,11 @@ manage(Window w, XWindowAttributes *wa) |
|
|
|
c->isfloat = trans |
|
|
|
|| ((c->maxw == c->minw) && (c->maxh == c->minh)); |
|
|
|
|
|
|
|
setgeom(c); |
|
|
|
settitle(c); |
|
|
|
|
|
|
|
arrange(NULL); |
|
|
|
|
|
|
|
/* mapping the window now prevents flicker */ |
|
|
|
if(c->tags[tsel]) { |
|
|
|
XMapRaised(dpy, c->win); |
|
|
@ -259,10 +262,10 @@ maximize(Arg *arg) |
|
|
|
{ |
|
|
|
if(!sel) |
|
|
|
return; |
|
|
|
sel->x = sx; |
|
|
|
sel->y = sy + bh; |
|
|
|
sel->w = sw - 2 * sel->border; |
|
|
|
sel->h = sh - 2 * sel->border - bh; |
|
|
|
*sel->x = sx; |
|
|
|
*sel->y = sy + bh; |
|
|
|
*sel->w = sw - 2 * sel->border; |
|
|
|
*sel->h = sh - 2 * sel->border - bh; |
|
|
|
higher(sel); |
|
|
|
resize(sel, False); |
|
|
|
} |
|
|
@ -286,32 +289,32 @@ resize(Client *c, Bool inc) |
|
|
|
|
|
|
|
if(inc) { |
|
|
|
if(c->incw) |
|
|
|
c->w -= (c->w - c->basew) % c->incw; |
|
|
|
*c->w -= (*c->w - c->basew) % c->incw; |
|
|
|
if(c->inch) |
|
|
|
c->h -= (c->h - c->baseh) % c->inch; |
|
|
|
*c->h -= (*c->h - c->baseh) % c->inch; |
|
|
|
} |
|
|
|
if(c->x > sw) /* might happen on restart */ |
|
|
|
c->x = sw - c->w; |
|
|
|
if(c->y > sh) |
|
|
|
c->ty = c->y = sh - c->h; |
|
|
|
if(c->minw && c->w < c->minw) |
|
|
|
c->w = c->minw; |
|
|
|
if(c->minh && c->h < c->minh) |
|
|
|
c->h = c->minh; |
|
|
|
if(c->maxw && c->w > c->maxw) |
|
|
|
c->w = c->maxw; |
|
|
|
if(c->maxh && c->h > c->maxh) |
|
|
|
c->h = c->maxh; |
|
|
|
if(*c->x > sw) /* might happen on restart */ |
|
|
|
*c->x = sw - *c->w; |
|
|
|
if(*c->y > sh) |
|
|
|
*c->y = sh - *c->h; |
|
|
|
if(c->minw && *c->w < c->minw) |
|
|
|
*c->w = c->minw; |
|
|
|
if(c->minh && *c->h < c->minh) |
|
|
|
*c->h = c->minh; |
|
|
|
if(c->maxw && *c->w > c->maxw) |
|
|
|
*c->w = c->maxw; |
|
|
|
if(c->maxh && *c->h > c->maxh) |
|
|
|
*c->h = c->maxh; |
|
|
|
resizetitle(c); |
|
|
|
XSetWindowBorderWidth(dpy, c->win, 1); |
|
|
|
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); |
|
|
|
XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h); |
|
|
|
e.type = ConfigureNotify; |
|
|
|
e.event = c->win; |
|
|
|
e.window = c->win; |
|
|
|
e.x = c->x; |
|
|
|
e.y = c->y; |
|
|
|
e.width = c->w; |
|
|
|
e.height = c->h; |
|
|
|
e.x = *c->x; |
|
|
|
e.y = *c->y; |
|
|
|
e.width = *c->w; |
|
|
|
e.height = *c->h; |
|
|
|
e.border_width = c->border; |
|
|
|
e.above = None; |
|
|
|
e.override_redirect = False; |
|
|
@ -319,6 +322,23 @@ resize(Client *c, Bool inc) |
|
|
|
XSync(dpy, False); |
|
|
|
} |
|
|
|
|
|
|
|
void |
|
|
|
setgeom(Client *c) |
|
|
|
{ |
|
|
|
if((arrange == dotile) && !c->isfloat) { |
|
|
|
c->x = &c->tx; |
|
|
|
c->y = &c->ty; |
|
|
|
c->w = &c->tw; |
|
|
|
c->h = &c->th; |
|
|
|
} |
|
|
|
else { |
|
|
|
c->x = &c->fx; |
|
|
|
c->y = &c->fy; |
|
|
|
c->w = &c->fw; |
|
|
|
c->h = &c->fh; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
void |
|
|
|
setsize(Client *c) |
|
|
|
{ |
|
|
|