#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
+#define ISVISIBLE(x) (x->tags & tagset[seltags])
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
-enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
- ClkClientWin, ClkLast }; /* clicks */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
/* typedefs */
typedef unsigned int uint;
typedef struct Client Client;
struct Client {
char name[256];
+ float mina, maxa;
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- float mina, maxa;
int bw, oldbw;
- Bool isbanned, isfixed, isfloating, ismoved, isurgent;
uint tags;
+ Bool isfixed, isfloating, isurgent;
Client *next;
Client *snext;
Window win;
static void buttonpress(XEvent *e);
static void checkotherwm(void);
static void cleanup(void);
+static void clearurgent(void);
static void configure(Client *c);
static void configurenotify(XEvent *e);
static void configurerequest(XEvent *e);
static void destroynotify(XEvent *e);
static void detach(Client *c);
static void detachstack(Client *c);
+static void die(const char *errstr, ...);
static void drawbar(void);
static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
static void drawtext(const char *text, ulong col[ColLast], Bool invert);
static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
static void expose(XEvent *e);
static void focus(Client *c);
static void focusin(XEvent *e);
static void manage(Window w, XWindowAttributes *wa);
static void mappingnotify(XEvent *e);
static void maprequest(XEvent *e);
+static void monocle(void);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
static void run(void);
static void scan(void);
static void setclientstate(Client *c, long state);
+static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
static void spawn(const Arg *arg);
static void tile(void);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
-static void togglelayout(const Arg *arg);
-static void togglemax(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unmanage(Client *c);
static char stext[256];
static int screen, sx, sy, sw, sh;
static int by, bh, blw, wx, wy, ww, wh;
-static uint seltags = 0;
+static uint seltags = 0, sellt = 0;
static int (*xerrorxlib)(Display *, XErrorEvent *);
static uint numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
static Atom wmatom[WMLast], netatom[NetLast];
-static Bool ismax = False;
static Bool otherwm, readin;
static Bool running = True;
static uint tagset[] = {1, 1}; /* after start, first tag is selected */
static Cursor cursor[CurLast];
static Display *dpy;
static DC dc = {0};
-static Layout *lt = NULL;
+static Layout *lt[] = { NULL, NULL };
static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags & tagset[seltags]) { /* is visible */
- if(ismax && !c->isfixed) {
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- c->ismoved = True;
- }
- else if(!lt->arrange || c->isfloating)
+ if(ISVISIBLE(c)) {
+ XMoveWindow(dpy, c->win, c->x, c->y);
+ if(!lt[sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
- c->isbanned = False;
}
- else if(!c->isbanned) {
+ else {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = c->ismoved = True;
}
focus(NULL);
- if(lt->arrange && !ismax)
- lt->arrange();
+ if(lt[sellt]->arrange)
+ lt[sellt]->arrange();
restack();
}
void
buttonpress(XEvent *e) {
uint i, x, click;
+ Arg arg = {0};
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- click = ClkLast;
+ click = ClkRootWin;
if(ev->window == barwin) {
i = x = 0;
- do
- x += TEXTW(tags[i]);
- while(ev->x >= x && ++i < LENGTH(tags));
- if(i < LENGTH(tags))
- click = i;
+ do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+ if(i < LENGTH(tags)) {
+ click = ClkTagBar;
+ arg.ui = 1 << i;
+ }
else if(ev->x < x + blw)
click = ClkLtSymbol;
else if(ev->x > wx + ww - TEXTW(stext))
else
click = ClkWinTitle;
}
- else if((c = getclient(ev->window)))
+ else if((c = getclient(ev->window))) {
+ focus(c);
click = ClkClientWin;
+ }
for(i = 0; i < LENGTH(buttons); i++)
if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
- buttons[i].func(&buttons[i].arg);
+ buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
}
void
XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
if(otherwm)
- eprint("dwm: another window manager is already running\n");
+ die("dwm: another window manager is already running\n");
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
close(STDIN_FILENO);
view(&a);
- lt = &foo;
+ lt[sellt] = &foo;
while(stack)
unmanage(stack);
if(dc.font.set)
}
void
+clearurgent(void) {
+ XWMHints *wmh;
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(ISVISIBLE(c) && c->isurgent) {
+ c->isurgent = False;
+ if (!(wmh = XGetWMHints(dpy, c->win)))
+ continue;
+
+ wmh->flags &= ~XUrgencyHint;
+ XSetWMHints(dpy, c->win, wmh);
+ XFree(wmh);
+ }
+}
+
+void
configure(Client *c) {
XConfigureEvent ce;
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(ismax && !c->isbanned && !c->isfixed)
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
- else if(c->isfloating || !lt->arrange) {
+ else if(c->isfloating || !lt[sellt]->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
if((c->y - sy + c->h) > sh && c->isfloating)
c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
- if((ev->value_mask & (CWX|CWY))
- && !(ev->value_mask & (CWWidth|CWHeight)))
+ if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(!c->isbanned)
+ if(ISVISIBLE(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
void
detach(Client *c) {
- Client *i;
+ Client **tc;
- if (c != clients) {
- for(i = clients; i->next != c; i = i->next);
- i->next = c->next;
- }
- else {
- clients = c->next;
- }
- c->next = NULL;
+ for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+ *tc = c->next;
}
void
}
void
+die(const char *errstr, ...) {
+ va_list ap;
+
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+ exit(EXIT_FAILURE);
+}
+
+void
drawbar(void) {
int i, x;
- Client *c;
dc.x = 0;
- for(c = stack; c && c->isbanned; c = c->snext);
for(i = 0; i < LENGTH(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);
+ drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
+ drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt->symbol, dc.norm, ismax);
+ drawtext(lt[sellt]->symbol, dc.norm, False);
x = dc.x + dc.w;
}
else
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(c) {
- drawtext(c->name, dc.sel, False);
- drawsquare(c->isfixed, c->isfloating, False, dc.sel);
+ if(sel) {
+ drawtext(sel->name, dc.sel, False);
+ drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
}
else
drawtext(NULL, dc.norm, False);
}
void
-eprint(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
-void
expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
void
focus(Client *c) {
- if(!c || c->isbanned)
- for(c = stack; c && c->isbanned; c = c->snext);
+ if(!c || !ISVISIBLE(c))
+ for(c = stack; c && !ISVISIBLE(c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(!sel)
return;
if (arg->i > 0) {
- for(c = sel->next; c && c->isbanned; c = c->next);
+ for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
if(!c)
- for(c = clients; c && c->isbanned; c = c->next);
+ for(c = clients; c && !ISVISIBLE(c); c = c->next);
}
else {
for(i = clients; i != sel; i = i->next)
- if (!i->isbanned)
+ if(ISVISIBLE(i))
c = i;
if(!c)
for(; i; i = i->next)
- if (!i->isbanned)
+ if(ISVISIBLE(i))
c = i;
}
if(c) {
XColor color;
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- eprint("error, cannot allocate color '%s'\n", colstr);
+ die("error, cannot allocate color '%s'\n", colstr);
return color.pixel;
}
void
grabbuttons(Client *c, Bool focused) {
- int i, j;
- uint buttons[] = { Button1, Button2, Button3 };
- uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
+ uint i, j;
+ uint modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- if(focused)
+ if(focused) {
for(i = 0; i < LENGTH(buttons); i++)
- for(j = 0; j < LENGTH(modifiers); j++)
- XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
- else
+ if(buttons[i].click == ClkClientWin)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ } else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
void
dc.font.xfont = NULL;
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
- eprint("error, cannot load font: '%s'\n", fontstr);
+ die("error, cannot load font: '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}
XWindowChanges wc;
if(!(c = calloc(1, sizeof(Client))))
- eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
+ die("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
/* geometry */
if(c->y + c->h + 2 * c->bw > sy + sh)
c->y = sy + sh - c->h - 2 * c->bw;
c->x = MAX(c->x, sx);
- c->y = MAX(c->y, by == 0 ? bh : sy);
+ /* only fix client y-offset, if the client center might cover the bar */
+ c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
c->bw = borderpx;
}
XRaiseWindow(dpy, c->win);
attach(c);
attachstack(c);
- XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+ XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
arrange();
}
void
+monocle(void) {
+ Client *c;
+
+ for(c = nexttiled(clients); c; c = nexttiled(c->next))
+ resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+}
+
+void
movemouse(const Arg *arg) {
int x1, y1, ocx, ocy, di, nx, ny;
uint dui;
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
- if(x1 < c->x || x1 > c->x + c->w || y1 < c->y || y1 > c->y + c->h) {
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, 0, 0);
- x1 = c->x + 1;
- y1 = c->y + 1;
- }
for(;;) {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
ny = wy;
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
ny = wy + wh - c->h - 2 * c->bw;
- if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
- if(!lt->arrange || c->isfloating)
+ if(!lt[sellt]->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
Client *
nexttiled(Client *c) {
- for(; c && (c->isfloating || c->isbanned); c = c->next);
+ for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
return c;
}
w = MAX(w, c->minw);
h = MAX(h, c->minh);
-
- if (c->maxw)
+
+ if(c->maxw)
w = MIN(w, c->maxw);
- if (c->maxh)
+ if(c->maxh)
h = MIN(h, c->maxh);
}
if(w <= 0 || h <= 0)
h = bh;
if(w < bh)
w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
- c->ismoved = False;
+ if(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
- if(!c->isfloating && lt->arrange
+ if(!c->isfloating && lt[sellt]->arrange
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL);
}
- if(!lt->arrange || c->isfloating)
+ if(!lt[sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
drawbar();
if(!sel)
return;
- if(ismax || sel->isfloating || !lt->arrange)
+ if(sel->isfloating || !lt[sellt]->arrange)
XRaiseWindow(dpy, sel->win);
- if(!ismax && lt->arrange) {
+ if(lt[sellt]->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && !c->isbanned) {
+ if(!c->isfloating && ISVISIBLE(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
if(errno == EINTR)
continue;
- eprint("select failed\n");
+ die("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
PropModeReplace, (unsigned char *)data, 2);
}
+void
+setlayout(const Arg *arg) {
+ if(!arg || !arg->v || arg->v != lt[sellt])
+ sellt ^= 1;
+ if(arg && arg->v)
+ lt[sellt] = (Layout *)arg->v;
+ if(sel)
+ arrange();
+ else
+ drawbar();
+}
+
/* arg > 1.0 will set mfact absolutly */
void
setmfact(const Arg *arg) {
float f;
- if(!arg || !lt->arrange)
+ if(!arg || !lt[sellt]->arrange)
return;
f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.h = dc.font.height + 2;
- lt = layouts;
+ lt[0] = &layouts[0];
+ lt[1] = &layouts[1 % LENGTH(layouts)];
updategeom();
/* init atoms */
}
void
-togglelayout(const Arg *arg) {
- if(arg && arg->v)
- lt = (Layout *)arg->v;
- else if(++lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- if(sel)
- arrange();
- else
- drawbar();
-}
-
-void
-togglemax(const Arg *arg) {
- ismax = !ismax;
- arrange();
-}
-
-void
toggletag(const Arg *arg) {
- if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
+ uint mask = sel->tags ^ (arg->ui & TAGMASK);
+
+ if(sel && mask) {
+ sel->tags = mask;
arrange();
+ }
}
void
toggleview(const Arg *arg) {
- if((tagset[seltags] ^= (arg->ui & TAGMASK)))
+ uint mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+
+ if(mask) {
+ tagset[seltags] = mask;
+ clearurgent();
arrange();
+ }
}
void
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- if(c == sel)
- sel->isurgent = False;
+ if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) {
+ wmh->flags &= ~XUrgencyHint;
+ XSetWMHints(dpy, c->win, wmh);
+ }
else
c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+
XFree(wmh);
}
}
void
view(const Arg *arg) {
+ if(arg && (arg->i & TAGMASK) == tagset[seltags])
+ return;
seltags ^= 1; /* toggle sel tagset */
if(arg && (arg->ui & TAGMASK))
tagset[seltags] = arg->i & TAGMASK;
+ clearurgent();
arrange();
}
zoom(const Arg *arg) {
Client *c = sel;
- if(ismax || !lt->arrange || (sel && sel->isfloating))
+ if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+ die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
- eprint("usage: dwm [-v]\n");
+ die("usage: dwm [-v]\n");
+
+ if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ fprintf(stderr, "warning: no locale support\n");
- setlocale(LC_CTYPE, "");
if(!(dpy = XOpenDisplay(0)))
- eprint("dwm: cannot open display\n");
+ die("dwm: cannot open display\n");
checkotherwm();
setup();
Got questions, comments, patches, etc.? Contact Jason Woofenden