* Each child of the root window is called a client, except windows which have
* set the override_redirect flag. Clients are organized in a global
* doubly-linked client list, the focus history is remembered through a global
- * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.
+ * stack list. Each client contains a bit array to indicate the tags of a
+ * client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
#define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */
typedef struct {
const char *symbol;
void (*arrange)(void);
- void (*updategeom)(void);
} Layout;
typedef struct {
void spawn(const void *arg);
void tag(const void *arg);
uint textnw(const char *text, uint len);
-uint textw(const char *text);
void tile(void);
-void tileresize(Client *c, int x, int y, int w, int h);
void togglebar(const void *arg);
void togglefloating(const void *arg);
void togglelayout(const void *arg);
void updatebar(void);
void updategeom(void);
void updatesizehints(Client *c);
-void updatetilegeom(void);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const void *arg);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
-int mx, my, mw, mh, tx, ty, tw, th;
+int by, bh, blw, wx, wy, ww, wh;
uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
uint numlockmask = 0;
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool domax = False;
+Bool ismax = False;
Bool otherwm, readin;
Bool running = True;
uint tagset[] = {1, 1}; /* after start, first tag is selected */
}
focus(NULL);
- if(lt->arrange && !domax)
+ if(lt->arrange && !ismax)
lt->arrange();
restack();
}
if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- x += textw(tags[i]);
+ x += TEXTW(tags[i]);
if(ev->x < x) {
mask = 1 << i;
if(ev->button == Button1) {
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY || domax)
+ if(CLEANMASK(ev->state) != MODKEY || ismax)
return;
if(ev->button == Button1)
movemouse(c);
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
- XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
void
cleanup(void) {
close(STDIN_FILENO);
- view(NULL);
+ view((uint[]){~0});
while(stack)
unmanage(stack);
if(dc.font.set)
dc.x = 0;
for(c = stack; c && !VISIBLE(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
- dc.w = textw(tags[i]);
+ dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt->symbol, dc.norm, domax);
+ drawtext(lt->symbol, dc.norm, ismax);
x = dc.x + dc.w;
}
else
x = dc.x;
- dc.w = textw(stext);
- dc.x = bw - dc.w;
+ dc.w = TEXTW(stext);
+ dc.x = ww - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = bw - x;
+ dc.w = ww - x;
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
XSync(dpy, False);
}
}
sel = c;
if(c) {
- if(domax) {
+ if(ismax) {
XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
c->ismax = True;
}
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
- {
- if(keys[i].func)
- keys[i].func(keys[i].arg);
- }
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+ && keys[i].func)
+ keys[i].func(keys[i].arg);
}
void
x = sx;
if(y + h + 2 * c->bw < sy)
y = sy;
+ if(h < bh)
+ h = bh;
+ if(w < bh)
+ w = bh;
if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
c->isbanned = c->ismax = False;
c->x = wc.x = x;
drawbar();
if(!sel)
return;
- if(domax || sel->isfloating || !lt->arrange)
+ if(ismax || sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(!domax && lt->arrange) {
+ if(!ismax && lt->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
if(d < 0.1 || d > 0.9)
return;
mfact = d;
- updatetilegeom();
arrange();
}
/* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
- w = textw(layouts[i].symbol);
+ w = TEXTW(layouts[i].symbol);
blw = MAX(blw, w);
}
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+ barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
return XTextWidth(dc.font.xfont, text, len);
}
-uint
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
-}
-
void
tile(void) {
- int x, y, h, w;
+ int x, y, h, w, mw;
uint i, n;
Client *c;
/* master */
c = nexttiled(clients);
-
- if(n == 1)
- tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- else
- tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+ mw = mfact * ww;
+ resize(c, wx, wy, ((n == 1) ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
if(--n == 0)
return;
/* tile stack */
- x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
- y = ty;
- w = (tx > c->x + c->w) ? wx + ww - x : tw;
- h = th / n;
+ x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : ww - mw;
+ y = wy;
+ w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+ h = wh / n;
if(h < bh)
- h = th;
+ h = wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- if(i + 1 == n) /* remainder */
- tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
- else
- tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
- if(h != th)
+ resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+ ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+ if(h != wh)
y = c->y + c->h + 2 * c->bw;
}
}
-void
-tileresize(Client *c, int x, int y, int w, int h) {
- resize(c, x, y, w, h, resizehints);
- if(resizehints && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
- /* client doesn't accept size constraints */
- resize(c, x, y, w, h, False);
-}
-
void
togglebar(const void *arg) {
showbar = !showbar;
void
togglemax(const void *arg) {
- domax = !domax;
+ ismax = !ismax;
arrange();
}
updatebar(void) {
if(dc.drawable != 0)
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+ dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
}
void
wh = showbar ? sh - bh : sh;
}
- /* bar geometry */
- bx = wx;
+ /* bar position */
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
- bw = ww;
-
- /* update layout geometries */
- for(i = 0; i < LENGTH(layouts); i++)
- if(layouts[i].updategeom)
- layouts[i].updategeom();
}
void
&& c->maxw == c->minw && c->maxh == c->minh);
}
-void
-updatetilegeom(void) {
- /* master area geometry */
- mx = wx;
- my = wy;
- mw = mfact * ww;
- mh = wh;
-
- /* tile area geometry */
- tx = mx + mw;
- ty = wy;
- tw = ww - mw;
- th = wh;
-}
-
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))