char name[256];
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int minax, maxax, minay, maxay;
- long flags;
+ float mina, maxa;
int bw, oldbw;
Bool isbanned, isfixed, isfloating, ismoved, isurgent;
uint tags;
Client *next;
- Client *prev;
Client *snext;
Window win;
};
} font;
} DC; /* draw context */
+typedef union {
+ int i;
+ uint ui;
+ float f;
+ void *v;
+} Arg;
+
typedef struct {
uint mod;
KeySym keysym;
- void (*func)(const void *arg);
- const void *arg;
+ void (*func)(const Arg *);
+ const Arg arg;
} Key;
typedef struct {
} Rule;
/* function declarations */
-void applyrules(Client *c);
-void arrange(void);
-void attach(Client *c);
-void attachstack(Client *c);
-void buttonpress(XEvent *e);
-void checkotherwm(void);
-void cleanup(void);
-void configure(Client *c);
-void configurenotify(XEvent *e);
-void configurerequest(XEvent *e);
-void destroynotify(XEvent *e);
-void detach(Client *c);
-void detachstack(Client *c);
-void drawbar(void);
-void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
-void drawtext(const char *text, ulong col[ColLast], Bool invert);
-void enternotify(XEvent *e);
-void eprint(const char *errstr, ...);
-void expose(XEvent *e);
-void focus(Client *c);
-void focusin(XEvent *e);
-void focusnext(const void *arg);
-void focusprev(const void *arg);
-Client *getclient(Window w);
-ulong getcolor(const char *colstr);
-long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, uint size);
-void grabbuttons(Client *c, Bool focused);
-void grabkeys(void);
-void initfont(const char *fontstr);
-Bool isoccupied(uint t);
-Bool isprotodel(Client *c);
-Bool isurgent(uint t);
-void keypress(XEvent *e);
-void killclient(const void *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-void movemouse(Client *c);
-Client *nexttiled(Client *c);
-void propertynotify(XEvent *e);
-void quit(const void *arg);
-void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-void resizemouse(Client *c);
-void restack(void);
-void run(void);
-void scan(void);
-void setclientstate(Client *c, long state);
-void setmfact(const void *arg);
-void setup(void);
-void spawn(const void *arg);
-void tag(const void *arg);
-uint textnw(const char *text, uint len);
-void tile(void);
-void togglebar(const void *arg);
-void togglefloating(const void *arg);
-void togglelayout(const void *arg);
-void togglemax(const void *arg);
-void toggletag(const void *arg);
-void toggleview(const void *arg);
-void unmanage(Client *c);
-void unmapnotify(XEvent *e);
-void updatebar(void);
-void updategeom(void);
-void updatesizehints(Client *c);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-void view(const void *arg);
-void viewprevtag(const void *arg);
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dpy, XErrorEvent *ee);
-int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const void *arg);
+static void applyrules(Client *c);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(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 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 focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static ulong getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isoccupied(uint t);
+static Bool isprotodel(Client *c);
+static Bool isurgent(uint t);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void movemouse(Client *c);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(Client *c);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, uint len);
+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 void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);
/* variables */
-char stext[256];
-int screen, sx, sy, sw, sh;
-int by, bh, blw, wx, wy, ww, wh;
-uint seltags = 0;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-uint numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+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 int (*xerrorxlib)(Display *, XErrorEvent *);
+static uint numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[ConfigureNotify] = configurenotify,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
};
-Atom wmatom[WMLast], netatom[NetLast];
-Bool ismax = False;
-Bool otherwm, readin;
-Bool running = True;
-uint tagset[] = {1, 1}; /* after start, first tag is selected */
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Layout layouts[];
-Layout *lt = layouts;
-Window root, barwin;
-
+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 Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt = NULL;
+static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
void
attach(Client *c) {
- if(clients)
- clients->prev = c;
c->next = clients;
clients = c;
}
void
buttonpress(XEvent *e) {
- uint i, x, mask;
+ uint i, mask;
+ int x;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
mask = 1 << i;
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&mask);
+ tag((Arg*)&mask);
else
- view(&mask);
+ view((Arg*)&mask);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&mask);
+ toggletag((Arg*)&mask);
else
- toggleview(&mask);
+ toggleview((Arg*)&mask);
}
return;
}
}
if(ev->x < x + blw) {
- if(ev->button == Button1)
+ if(ev->button == Button1)
togglelayout(NULL);
- else if(ev->button == Button3)
+ else if(ev->button == Button3)
togglemax(NULL);
}
}
void
cleanup(void) {
+ Arg a = {.i = ~0};
+ Layout foo = { "", NULL };
+
close(STDIN_FILENO);
- view((uint[]){~0});
+ view(&a);
+ lt = &foo;
while(stack)
unmanage(stack);
if(dc.font.set)
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(c->isfixed || c->isfloating || !lt->arrange) {
+ 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) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
void
detach(Client *c) {
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
+ Client *i;
+
+ if (c != clients) {
+ for(i = clients; i->next != c; i = i->next);
+ i->next = c->next;
+ }
+ else {
clients = c->next;
- c->next = c->prev = NULL;
+ }
+ c->next = NULL;
}
void
void
drawtext(const char *text, ulong col[ColLast], Bool invert) {
- int x, y, w, h;
- uint len, olen;
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
olen = strlen(text);
len = MIN(olen, sizeof buf);
memcpy(buf, text, len);
- w = 0;
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+ for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
if(!len)
return;
- if(len < olen) {
- if(len > 1)
- buf[len - 1] = '.';
- if(len > 2)
- buf[len - 2] = '.';
- if(len > 3)
- buf[len - 3] = '.';
- }
+ if(len < olen)
+ for(i = len; i && i > len - 3; buf[--i] = '.');
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
void
focus(Client *c) {
- if(!c || (c && c->isbanned))
+ if(!c || c->isbanned)
for(c = stack; c && c->isbanned; c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- }
- sel = c;
- if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ sel = c;
drawbar();
}
}
void
-focusnext(const void *arg) {
- Client *c;
+focusstack(const Arg *arg) {
+ Client *c = NULL, *i;
if(!sel)
return;
- for(c = sel->next; c && c->isbanned; c = c->next);
- if(!c)
- for(c = clients; c && c->isbanned; c = c->next);
- if(c) {
- focus(c);
- restack();
+ if (arg->i > 0) {
+ for(c = sel->next; c && c->isbanned; c = c->next);
+ if(!c)
+ for(c = clients; c && c->isbanned; c = c->next);
}
-}
-
-void
-focusprev(const void *arg) {
- Client *c;
-
- if(!sel)
- return;
- for(c = sel->prev; c && c->isbanned; c = c->prev);
- if(!c) {
- for(c = clients; c && c->next; c = c->next);
- for(; c && c->isbanned; c = c->prev);
+ else {
+ for(i = clients; i != sel; i = i->next)
+ if (!i->isbanned)
+ c = i;
+ if(!c)
+ for(; i; i = i->next)
+ if (!i->isbanned)
+ c = i;
}
if(c) {
focus(c);
grabbuttons(Client *c, Bool focused) {
int i, j;
uint buttons[] = { Button1, Button2, Button3 };
- uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
- MODKEY|numlockmask|LockMask} ;
+ uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
if(focused)
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func)
- keys[i].func(keys[i].arg);
+ keys[i].func(&(keys[i].arg));
}
void
-killclient(const void *arg) {
+killclient(const Arg *arg) {
XEvent ev;
if(!sel)
applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
+ if(c->isfloating)
+ XRaiseWindow(dpy, c->win);
attach(c);
attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
}
void
-quit(const void *arg) {
+quit(const Arg *arg) {
readin = running = False;
}
h -= c->baseh;
/* adjust for aspect limits */
- if(c->minax != c->maxax && c->minay != c->maxay
- && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
- if(w * c->maxay > h * c->maxax)
- w = h * c->maxax / c->maxay;
- else if(w * c->minay < h * c->minax)
- h = w * c->minay / c->minax;
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float) w/h)
+ w = h * c->maxa;
+ else if(c->mina > (float) h/w)
+ h = w * c->mina;
}
/* adjust for increment value */
if(w < bh)
w = bh;
if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
- c->isbanned = c->ismoved = False;
+ c->ismoved = False;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
/* arg > 1.0 will set mfact absolutly */
void
-setmfact(const void *arg) {
- double d = *((double*) arg);
+setmfact(const Arg *arg) {
+ float f;
- if(!d || lt->arrange != tile)
+ if(!arg || !lt->arrange)
return;
- d = d < 1.0 ? d + mfact : d - 1.0;
- if(d < 0.1 || d > 0.9)
+ f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+ if(f < 0.1 || f > 0.9)
return;
- mfact = d;
+ mfact = f;
arrange();
}
void
setup(void) {
- uint i, w;
+ uint i;
+ int w;
XSetWindowAttributes wa;
/* init screen */
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.font.height + 2;
+ lt = layouts;
updategeom();
/* init atoms */
}
void
-spawn(const void *arg) {
- static char *shell = NULL;
-
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
+spawn(const Arg *arg) {
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", (char *)arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
+ execvp(((char **)arg->v)[0], (char **)arg->v);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
perror(" failed");
}
exit(0);
}
void
-tag(const void *arg) {
- if(sel && *(int *)arg & TAGMASK) {
- sel->tags = *(int *)arg & TAGMASK;
+tag(const Arg *arg) {
+ if(sel && arg->ui & TAGMASK) {
+ sel->tags = arg->ui & TAGMASK;
arrange();
}
}
-uint
+int
textnw(const char *text, uint len) {
XRectangle r;
/* master */
c = nexttiled(clients);
mw = mfact * ww;
- resize(c, wx, wy, ((n == 1) ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
if(--n == 0)
return;
/* tile stack */
- x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : ww - mw;
+ x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
y = wy;
w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
h = wh / n;
}
void
-togglebar(const void *arg) {
+togglebar(const Arg *arg) {
showbar = !showbar;
updategeom();
updatebar();
}
void
-togglefloating(const void *arg) {
+togglefloating(const Arg *arg) {
if(!sel)
return;
sel->isfloating = !sel->isfloating || sel->isfixed;
}
void
-togglelayout(const void *arg) {
- uint i;
-
- if(!arg) {
- if(++lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp((char *)arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- lt = &layouts[i];
- }
+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
}
void
-togglemax(const void *arg) {
+togglemax(const Arg *arg) {
ismax = !ismax;
arrange();
}
void
-toggletag(const void *arg) {
- if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
- sel->tags ^= (*(int *)arg) & TAGMASK;
+toggletag(const Arg *arg) {
+ if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
arrange();
- }
}
void
-toggleview(const void *arg) {
- if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
- tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+toggleview(const Arg *arg) {
+ if((tagset[seltags] ^= (arg->ui & TAGMASK)))
arrange();
- }
}
void
void
updategeom(void) {
- int i;
#ifdef XINERAMA
+ int i;
XineramaScreenInfo *info = NULL;
/* window area geometry */
long msize;
XSizeHints size;
- if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
- size.flags = PSize;
- c->flags = size.flags;
- if(c->flags & PBaseSize) {
+ XGetWMNormalHints(dpy, c->win, &size, &msize);
+ if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
}
- else if(c->flags & PMinSize) {
+ else if(size.flags & PMinSize) {
c->basew = size.min_width;
c->baseh = size.min_height;
}
else
c->basew = c->baseh = 0;
- if(c->flags & PResizeInc) {
+ if(size.flags & PResizeInc) {
c->incw = size.width_inc;
c->inch = size.height_inc;
}
else
c->incw = c->inch = 0;
- if(c->flags & PMaxSize) {
+ if(size.flags & PMaxSize) {
c->maxw = size.max_width;
c->maxh = size.max_height;
}
else
c->maxw = c->maxh = 0;
- if(c->flags & PMinSize) {
+ if(size.flags & PMinSize) {
c->minw = size.min_width;
c->minh = size.min_height;
}
- else if(c->flags & PBaseSize) {
+ else if(size.flags & PBaseSize) {
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
- if(c->flags & PAspect) {
- c->minax = size.min_aspect.x;
- c->maxax = size.max_aspect.x;
- c->minay = size.min_aspect.y;
- c->maxay = size.max_aspect.y;
+ if(size.flags & PAspect) {
+ c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
+ c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
}
else
- c->minax = c->maxax = c->minay = c->maxay = 0;
+ c->maxa = c->mina = 0.0;
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
&& c->maxw == c->minw && c->maxh == c->minh);
}
}
void
-view(const void *arg) {
- if(*(int *)arg & TAGMASK) {
- seltags ^= 1; /* toggle sel tagset */
- tagset[seltags] = *(int *)arg & TAGMASK;
- arrange();
- }
-}
-
-void
-viewprevtag(const void *arg) {
+view(const Arg *arg) {
seltags ^= 1; /* toggle sel tagset */
+ if(arg && (arg->ui & TAGMASK))
+ tagset[seltags] = arg->i & TAGMASK;
arrange();
}
}
void
-zoom(const void *arg) {
+zoom(const Arg *arg) {
Client *c = sel;
- if(!lt->arrange || sel->isfloating)
+ if(ismax || !lt->arrange || (sel && sel->isfloating))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
Got questions, comments, patches, etc.? Contact Jason Woofenden