#endif
/* macros */
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#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 BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(x) (x->tags & tagset[seltags])
+#define LENGTH(x) (sizeof x / sizeof x[0])
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAXTAGLEN 16
+#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define WIDTH(x) ((x)->w + 2 * (x)->bw)
+#define HEIGHT(x) ((x)->h + 2 * (x)->bw)
+#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
/* 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 { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+
+typedef union {
+ int i;
+ unsigned int ui;
+ float f;
+ void *v;
+} Arg;
+
+typedef struct {
+ unsigned int click;
+ unsigned int mask;
+ unsigned int button;
+ void (*func)(const Arg *arg);
+ const Arg arg;
+} Button;
-/* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
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;
- int minax, maxax, minay, maxay;
int bw, oldbw;
- Bool isbanned, isfixed, isfloating, ismoved, isurgent;
- uint tags;
+ unsigned int tags;
+ Bool isfixed, isfloating, isurgent;
Client *next;
- Client *prev;
Client *snext;
Window win;
};
typedef struct {
int x, y, w, h;
- ulong norm[ColLast];
- ulong sel[ColLast];
+ unsigned long norm[ColLast];
+ unsigned long sel[ColLast];
Drawable drawable;
GC gc;
struct {
} DC; /* draw context */
typedef struct {
- uint mod;
+ unsigned int mod;
KeySym keysym;
- void (*func)(const void *arg);
- const void *arg;
+ void (*func)(const Arg *);
+ const Arg arg;
} Key;
typedef struct {
const char *class;
const char *instance;
const char *title;
- uint tags;
+ unsigned int tags;
Bool isfloating;
} 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);
-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 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, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+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 unsigned long getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isprotodel(Client *c);
+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 monocle(void);
+static void movemouse(const Arg *arg);
+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(const Arg *arg);
+static void restack(void);
+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 showhide(Client *c);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, unsigned int len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(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 updatenumlockmask(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;
+static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */
+static int by, bh, blw; /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
+static unsigned int seltags = 0, sellt = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int 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 otherwm;
+static Bool running = True;
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc;
+static Layout *lt[] = { NULL, NULL };
+static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* compile-time check if all tags fit into an uint bit array. */
-struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
+/* compile-time check if all tags fit into an unsigned int bit array. */
+struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
/* function implementations */
void
applyrules(Client *c) {
- uint i;
+ unsigned int i;
Rule *r;
XClassHint ch = { 0 };
/* rule matching */
- XGetClassHint(dpy, c->win, &ch);
- for(i = 0; i < LENGTH(rules); i++) {
- r = &rules[i];
- if((!r->title || strstr(c->name, r->title))
- && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
- && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
- c->isfloating = r->isfloating;
- c->tags |= r->tags & TAGMASK;
+ if(XGetClassHint(dpy, c->win, &ch)) {
+ for(i = 0; i < LENGTH(rules); i++) {
+ r = &rules[i];
+ if((!r->title || strstr(c->name, r->title))
+ && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+ && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+ c->isfloating = r->isfloating;
+ c->tags |= r->tags & TAGMASK;
+ }
}
+ if(ch.res_class)
+ XFree(ch.res_class);
+ if(ch.res_name)
+ XFree(ch.res_name);
}
- if(ch.res_class)
- XFree(ch.res_class);
- if(ch.res_name)
- XFree(ch.res_name);
if(!c->tags)
c->tags = tagset[seltags];
}
void
arrange(void) {
- 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)
- resize(c, c->x, c->y, c->w, c->h, True);
- c->isbanned = False;
- }
- else if(!c->isbanned) {
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = c->ismoved = True;
- }
-
+ showhide(stack);
focus(NULL);
- if(lt->arrange && !ismax)
- lt->arrange();
+ if(lt[sellt]->arrange)
+ lt[sellt]->arrange();
restack();
}
void
attach(Client *c) {
- if(clients)
- clients->prev = c;
c->next = clients;
clients = c;
}
void
buttonpress(XEvent *e) {
- uint i, x, mask;
+ unsigned int i, x, click;
+ Arg arg = {0};
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ click = ClkRootWin;
if(ev->window == barwin) {
- x = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- x += TEXTW(tags[i]);
- if(ev->x < x) {
- mask = 1 << i;
- if(ev->button == Button1) {
- if(ev->state & MODKEY)
- tag(&mask);
- else
- view(&mask);
- }
- else if(ev->button == Button3) {
- if(ev->state & MODKEY)
- toggletag(&mask);
- else
- toggleview(&mask);
- }
- return;
- }
- }
- if(ev->x < x + blw) {
- if(ev->button == Button1)
- togglelayout(NULL);
- else if(ev->button == Button3)
- togglemax(NULL);
+ i = x = 0;
+ 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))
+ click = ClkStatusText;
+ else
+ click = ClkWinTitle;
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
- return;
- if(ev->button == Button1)
- movemouse(c);
- else if(ev->button == Button2)
- togglefloating(NULL);
- else if(ev->button == Button3 && !c->isfixed)
- resizemouse(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(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
}
void
checkotherwm(void) {
otherwm = False;
- XSetErrorHandler(xerrorstart);
+ xerrorxlib = XSetErrorHandler(xerrorstart);
/* this causes an error if some other window manager is running */
XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
if(otherwm)
- eprint("dwm: another window manager is already running\n");
- XSetErrorHandler(NULL);
- xerrorxlib = XSetErrorHandler(xerror);
+ die("dwm: another window manager is already running\n");
+ XSetErrorHandler(xerror);
XSync(dpy, False);
}
void
cleanup(void) {
+ Arg a = {.ui = ~0};
+ Layout foo = { "", NULL };
+
close(STDIN_FILENO);
- view((uint[]){~0});
+ view(&a);
+ 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) {
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
- clients = c->next;
- c->next = c->prev = NULL;
+ Client **tc;
+
+ 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;
+ int x;
+ unsigned int i, occ = 0, urg = 0;
+ unsigned long *col;
Client *c;
+ for(c = clients; c; c = c->next) {
+ occ |= c->tags;
+ if(c->isurgent)
+ urg |= c->tags;
+ }
+
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);
- }
- else {
- drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
- }
+ col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+ drawtext(tags[i], col, urg & 1 << i);
+ drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);
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
-drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
}
void
-drawtext(const char *text, ulong col[ColLast], Bool invert) {
- int x, y, w, h;
- uint len, olen;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
char buf[256];
+ int i, x, y, h, len, olen;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
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 = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
if(!len)
return;
+ memcpy(buf, text, len);
if(len < olen)
- strncpy(&buf[MAX(0, len - 3)], "...", len);
+ 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
-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 && 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]);
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 && !ISVISIBLE(c); c = c->next);
+ if(!c)
+ for(c = clients; c && !ISVISIBLE(c); 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(ISVISIBLE(i))
+ c = i;
+ if(!c)
+ for(; i; i = i->next)
+ if(ISVISIBLE(i))
+ c = i;
}
if(c) {
focus(c);
return c;
}
-ulong
+unsigned long
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
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;
}
int format, status;
long result = -1;
unsigned char *p = NULL;
- ulong n, extra;
+ unsigned long n, extra;
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
}
Bool
-gettextprop(Window w, Atom atom, char *text, uint size) {
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {
char **list = NULL;
int n;
XTextProperty name;
void
grabbuttons(Client *c, Bool focused) {
- int i, j;
- uint buttons[] = { Button1, Button2, Button3 };
- uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
- MODKEY|numlockmask|LockMask} ;
-
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- 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
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ updatenumlockmask();
+ {
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused) {
+ for(i = 0; i < LENGTH(buttons); i++)
+ 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);
+ }
}
void
grabkeys(void) {
- uint i, j;
- KeyCode code;
- XModifierKeymap *modmap;
-
- /* init modifier map */
- modmap = XGetModifierMapping(dpy);
- for(i = 0; i < 8; i++)
- for(j = 0; j < modmap->max_keypermod; j++) {
- if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
- numlockmask = (1 << i);
+ updatenumlockmask();
+ { /* grab keys */
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ KeyCode code;
+
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+ True, GrabModeAsync, GrabModeAsync);
}
- XFreeModifiermap(modmap);
-
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- for(i = 0; i < LENGTH(keys); i++) {
- code = XKeysymToKeycode(dpy, keys[i].keysym);
- XGrabKey(dpy, code, keys[i].mod, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
}
}
int i, n;
missing = NULL;
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
}
}
else {
- if(dc.font.xfont)
- XFreeFont(dpy, dc.font.xfont);
- 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;
}
}
Bool
-isoccupied(uint t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->tags & 1 << t)
- return True;
- return False;
-}
-
-Bool
isprotodel(Client *c) {
int i, n;
Atom *protocols;
return ret;
}
-Bool
-isurgent(uint t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->isurgent && c->tags & 1 << t)
- return True;
- return False;
-}
-
void
keypress(XEvent *e) {
- uint i;
+ unsigned int i;
KeySym keysym;
XKeyEvent *ev;
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)
void
manage(Window w, XWindowAttributes *wa) {
+ static Client cz;
Client *c, *t = NULL;
- Status rettrans;
- Window trans;
+ Window trans = None;
XWindowChanges wc;
- if(!(c = calloc(1, sizeof(Client))))
- eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
+ if(!(c = malloc(sizeof(Client))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+ *c = cz;
c->win = w;
/* geometry */
if(c->w == sw && c->h == sh) {
c->x = sx;
c->y = sy;
- c->bw = wa->border_width;
+ c->bw = 0;
}
else {
- if(c->x + c->w + 2 * c->bw > sx + sw)
- c->x = sx + sw - c->w - 2 * c->bw;
- if(c->y + c->h + 2 * c->bw > sy + sh)
- c->y = sy + sh - c->h - 2 * c->bw;
+ if(c->x + WIDTH(c) > sx + sw)
+ c->x = sx + sw - WIDTH(c);
+ if(c->y + HEIGHT(c) > sy + sh)
+ c->y = sy + sh - HEIGHT(c);
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;
}
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
updatetitle(c);
- if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
- for(t = clients; t && t->win != trans; t = t->next);
+ if(XGetTransientForHint(dpy, w, &trans))
+ t = getclient(trans);
if(t)
c->tags = t->tags;
else
applyrules(c);
if(!c->isfloating)
- c->isfloating = (rettrans == Success) || c->isfixed;
+ c->isfloating = trans != None || 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 */
+ 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
-movemouse(Client *c) {
- int x1, y1, ocx, ocy, di, nx, ny;
- uint dui;
+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 x, y, ocx, ocy, di, nx, ny;
+ unsigned int dui;
+ Client *c;
Window dummy;
XEvent ev;
+ if(!(c = sel))
+ return;
restack();
- ocx = nx = c->x;
- ocy = ny = c->y;
+ ocx = c->x;
+ ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
- for(;;) {
+ XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+ if(usegrab)
+ XGrabServer(dpy);
+ do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
handler[ev.type](&ev);
break;
case MotionNotify:
- XSync(dpy, False);
- nx = ocx + (ev.xmotion.x - x1);
- ny = ocy + (ev.xmotion.y - y1);
+ nx = ocx + (ev.xmotion.x - x);
+ ny = ocy + (ev.xmotion.y - y);
if(snap && nx >= wx && nx <= wx + ww
&& ny >= wy && ny <= wy + wh) {
if(abs(wx - nx) < snap)
nx = wx;
- else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
- nx = wx + ww - c->w - 2 * c->bw;
+ else if(abs((wx + ww) - (nx + WIDTH(c))) < snap)
+ nx = wx + ww - WIDTH(c);
if(abs(wy - ny) < snap)
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))
+ else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
+ ny = wy + wh - HEIGHT(c);
+ 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;
}
}
+ while(ev.type != ButtonRelease);
+ if(usegrab)
+ XUngrabServer(dpy);
+ XUngrabPointer(dpy, CurrentTime);
}
Client *
nexttiled(Client *c) {
- for(; c && (c->isfloating || c->isbanned); c = c->next);
+ for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
return c;
}
}
void
-quit(const void *arg) {
+quit(const Arg *arg) {
readin = running = False;
}
XWindowChanges wc;
if(sizehints) {
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
+
/* set minimum possible */
w = MAX(1, w);
h = MAX(1, h);
- /* temporarily remove base dimensions */
- w -= c->basew;
- h -= c->baseh;
+ if(!baseismin) { /* temporarily remove base dimensions */
+ w -= c->basew;
+ 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;
+ }
+
+ if(baseismin) { /* increment calculation requires this */
+ w -= c->basew;
+ h -= c->baseh;
}
/* adjust for increment value */
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)
return;
if(x > sx + sw)
- x = sw - w - 2 * c->bw;
+ x = sw - WIDTH(c);
if(y > sy + sh)
- y = sh - h - 2 * c->bw;
+ y = sh - HEIGHT(c);
if(x + w + 2 * c->bw < sx)
x = sx;
if(y + h + 2 * c->bw < sy)
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;
}
void
-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {
int ocx, ocy;
int nw, nh;
+ Client *c;
XEvent ev;
+ if(!(c = sel))
+ return;
restack();
ocx = c->x;
ocy = c->y;
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
- for(;;) {
- XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
+ if(usegrab)
+ XGrabServer(dpy);
+ do {
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch(ev.type) {
- case ButtonRelease:
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->bw - 1, c->h + c->bw - 1);
- XUngrabPointer(dpy, CurrentTime);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
handler[ev.type](&ev);
break;
case MotionNotify:
- XSync(dpy, False);
- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+ nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
+ nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
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;
}
}
+ while(ev.type != ButtonRelease);
+ if(usegrab)
+ XUngrabServer(dpy);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+ XUngrabPointer(dpy, CurrentTime);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
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;
}
char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
- uint len, offset;
+ unsigned int len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
- readin = True;
offset = 0;
len = sizeof stext - 1;
sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
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))) {
void
scan(void) {
- uint i, num;
- Window *wins, d1, d2;
+ unsigned int i, num;
+ Window d1, d2, *wins = NULL;
XWindowAttributes wa;
- wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa)
&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
manage(wins[i], &wa);
}
+ if(wins)
+ XFree(wins);
}
- if(wins)
- XFree(wins);
}
void
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 void *arg) {
- double d = *((double*) arg);
+setmfact(const Arg *arg) {
+ float f;
- if(!d || !lt->arrange)
+ if(!arg || !lt[sellt]->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;
+ unsigned int i;
+ int w;
XSetWindowAttributes wa;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- initfont(FONT);
+ initfont(font);
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- bh = dc.font.height + 2;
+ bh = dc.h = dc.font.height + 2;
+ lt[0] = &layouts[0];
+ lt[1] = &layouts[1 % LENGTH(layouts)];
updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
/* init appearance */
- dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
- dc.norm[ColBG] = getcolor(NORMBGCOLOR);
- dc.norm[ColFG] = getcolor(NORMFGCOLOR);
- dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
- dc.sel[ColBG] = getcolor(SELBGCOLOR);
- dc.sel[ColFG] = getcolor(SELFGCOLOR);
- initfont(FONT);
- dc.h = bh;
+ dc.norm[ColBorder] = getcolor(normbordercolor);
+ dc.norm[ColBG] = getcolor(normbgcolor);
+ dc.norm[ColFG] = getcolor(normfgcolor);
+ dc.sel[ColBorder] = getcolor(selbordercolor);
+ dc.sel[ColBG] = getcolor(selbgcolor);
+ dc.sel[ColFG] = getcolor(selfgcolor);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
PropModeReplace, (unsigned char *) netatom, NetLast);
/* select for events */
- wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
-
- /* grab keys */
grabkeys();
}
void
-spawn(const void *arg) {
- static char *shell = NULL;
+showhide(Client *c) {
+ if(!c)
+ return;
+ if(ISVISIBLE(c)) { /* show clients top down */
+ 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);
+ showhide(c->snext);
+ }
+ else { /* hide clients bottom up */
+ showhide(c->snext);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ }
+}
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
+void
+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
-textnw(const char *text, uint len) {
+int
+textnw(const char *text, unsigned int len) {
XRectangle r;
if(dc.font.set) {
void
tile(void) {
int x, y, h, w, mw;
- uint i, n;
+ unsigned int i, n;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
/* 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;
h = wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
- ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+ if(i + 1 == n) { /* remainder */
+ if(wy + wh - y < bh)
+ resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, False);
+ else
+ resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, resizehints);
+ }
+ else
+ resize(c, x, y, w - 2 * c->bw, h - 2 * c->bw, resizehints);
if(h != wh)
- y = c->y + c->h + 2 * c->bw;
+ y = c->y + HEIGHT(c);
}
}
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];
- }
- if(sel)
- arrange();
- else
- drawbar();
-}
-
-void
-togglemax(const void *arg) {
- ismax = !ismax;
- arrange();
-}
+toggletag(const Arg *arg) {
+ unsigned int mask;
-void
-toggletag(const void *arg) {
- if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
- sel->tags ^= (*(int *)arg) & TAGMASK;
+ if (!sel)
+ return;
+
+ mask = sel->tags ^ (arg->ui & TAGMASK);
+ if(sel && mask) {
+ sel->tags = mask;
arrange();
}
}
void
-toggleview(const void *arg) {
- if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
- tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+toggleview(const Arg *arg) {
+ unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+
+ if(mask) {
+ tagset[seltags] = mask;
+ clearurgent();
arrange();
}
}
void
updategeom(void) {
- int i;
#ifdef XINERAMA
+ int n, i = 0;
XineramaScreenInfo *info = NULL;
/* window area geometry */
- if(XineramaIsActive(dpy)) {
- info = XineramaQueryScreens(dpy, &i);
- wx = info[0].x_org;
- wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
- ww = info[0].width;
- wh = showbar ? info[0].height - bh : info[0].height;
+ if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+ if(n > 1) {
+ int di, x, y;
+ unsigned int dui;
+ Window dummy;
+ if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ for(i = 0; i < n; i++)
+ if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+ break;
+ }
+ wx = info[i].x_org;
+ wy = showbar && topbar ? info[i].y_org + bh : info[i].y_org;
+ ww = info[i].width;
+ wh = showbar ? info[i].height - bh : info[i].height;
XFree(info);
}
else
}
void
+updatenumlockmask(void) {
+ unsigned int i, j;
+ XModifierKeymap *modmap;
+
+ numlockmask = 0;
+ modmap = XGetModifierMapping(dpy);
+ for(i = 0; i < 8; i++)
+ for(j = 0; j < modmap->max_keypermod; j++)
+ if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ numlockmask = (1 << i);
+ XFreeModifiermap(modmap);
+}
+
+void
updatesizehints(Client *c) {
long msize;
XSizeHints size;
- XGetWMNormalHints(dpy, c->win, &size, &msize);
+ if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+ /* size is uninitialized, ensure that size.flags aren't used */
+ size.flags = PSize;
if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
else
c->minw = c->minh = 0;
if(size.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;
+ 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);
+ && c->maxw == c->minw && c->maxh == c->minh);
}
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
- gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+ gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
}
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 void *arg) {
+view(const Arg *arg) {
+ if((arg->ui & TAGMASK) == tagset[seltags])
+ return;
seltags ^= 1; /* toggle sel tagset */
- if(arg && (*(int *)arg & TAGMASK))
- tagset[seltags] = *(int *)arg & TAGMASK;
+ if(arg->ui & TAGMASK)
+ tagset[seltags] = arg->ui & TAGMASK;
+ clearurgent();
arrange();
}
}
void
-zoom(const void *arg) {
+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