X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=5cbb59b8a178b88d64c27afd0cd669213c21cbe8;hp=504b78b0dcaa7ed40c19e2714b0bbe1e71532e78;hb=63d719023161c807242c01a2fe81a1097ca37447;hpb=71365a524f67235024de7db277c63f8ac4f46569 diff --git a/dwm.c b/dwm.c index 504b78b..5cbb59b 100644 --- a/dwm.c +++ b/dwm.c @@ -16,8 +16,8 @@ * 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. * @@ -39,36 +39,56 @@ #include #include #include +#ifdef XINERAMA +#include +#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 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 TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) +#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) /* enums */ -enum { BarTop, BarBot, BarOff, BarLast }; /* bar appearance */ 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 { 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 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; - long flags; - unsigned int bw, oldbw; - Bool isbanned, isfixed, isfloating, isurgent; - Bool *tags; + int bw, oldbw; + unsigned int tags; + Bool isfixed, isfloating, isurgent; Client *next; - Client *prev; Client *snext; Window win; }; @@ -89,112 +109,105 @@ typedef struct { } DC; /* draw context */ typedef struct { - unsigned long mod; + unsigned int mod; KeySym keysym; - void (*func)(const char *arg); - const char *arg; + void (*func)(const Arg *); + const Arg arg; } Key; typedef struct { const char *symbol; void (*arrange)(void); - void (*updategeom)(void); } Layout; typedef struct { const char *class; const char *instance; const char *title; - const char *tag; + unsigned int tags; Bool isfloating; } Rule; /* function declarations */ -void applyrules(Client *c); -void arrange(void); -void attach(Client *c); -void attachstack(Client *c); -void ban(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, unsigned long col[ColLast]); -void drawtext(const char *text, unsigned long col[ColLast], Bool invert); -void *emallocz(unsigned int size); -void enternotify(XEvent *e); -void eprint(const char *errstr, ...); -void expose(XEvent *e); -void focus(Client *c); -void focusin(XEvent *e); -void focusnext(const char *arg); -void focusprev(const char *arg); -Client *getclient(Window w); -unsigned long getcolor(const char *colstr); -long getstate(Window w); -Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); -void grabbuttons(Client *c, Bool focused); -void grabkeys(void); -unsigned int idxoftag(const char *t); -void initfont(const char *fontstr); -Bool isoccupied(unsigned int t); -Bool isprotodel(Client *c); -Bool isurgent(unsigned int t); -Bool isvisible(Client *c); -void keypress(XEvent *e); -void killclient(const char *arg); -void manage(Window w, XWindowAttributes *wa); -void mappingnotify(XEvent *e); -void maprequest(XEvent *e); -void movemouse(Client *c); -Client *nextunfloating(Client *c); -void propertynotify(XEvent *e); -void quit(const char *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 setup(void); -void spawn(const char *arg); -void tag(const char *arg); -unsigned int textnw(const char *text, unsigned int len); -unsigned int textw(const char *text); -void togglebar(const char *arg); -void togglefloating(const char *arg); -void togglelayout(const char *arg); -void toggletag(const char *arg); -void toggleview(const char *arg); -void unban(Client *c); -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 char *arg); -void viewprevtag(const char *arg); -int xerror(Display *dpy, XErrorEvent *ee); -int xerrordummy(Display *dpy, XErrorEvent *ee); -int xerrorstart(Display *dpy, XErrorEvent *ee); -void zoom(const char *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 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 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 bx, by, bw, bh, blw, wx, wy, ww, wh; -int seltags = 0; -int (*xerrorxlib)(Display *, XErrorEvent *); -unsigned int 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 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, @@ -208,30 +221,28 @@ void (*handler[LASTEvent]) (XEvent *) = { [PropertyNotify] = propertynotify, [UnmapNotify] = unmapnotify }; -Atom wmatom[WMLast], netatom[NetLast]; -Bool otherwm, readin; -Bool running = True; -Bool *tagset[2]; -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 unsigned int 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, NULL }; +static Window root, barwin; /* configuration, allows nested code to access above variables */ #include "config.h" -#define TAGSZ (LENGTH(tags) * sizeof(Bool)) -/* function implementations */ +/* 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) { unsigned int i; - Bool matched = False; Rule *r; XClassHint ch = { 0 }; @@ -243,18 +254,15 @@ applyrules(Client *c) { && (!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; - if(r->tag) { - c->tags[idxoftag(r->tag)] = True; - matched = True; - } + c->tags |= r->tags & TAGMASK; } } if(ch.res_class) XFree(ch.res_class); if(ch.res_name) XFree(ch.res_name); - if(!matched) - memcpy(c->tags, tagset[seltags], TAGSZ); + if(!c->tags) + c->tags = tagset[seltags]; } void @@ -262,24 +270,23 @@ arrange(void) { Client *c; for(c = clients; c; c = c->next) - if(isvisible(c)) { - unban(c); - 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); } - else - ban(c); + else { + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + } focus(NULL); - if(lt->arrange) - lt->arrange(); + if(lt[sellt]->arrange) + lt[sellt]->arrange(); restack(); } void attach(Client *c) { - if(clients) - clients->prev = c; c->next = clients; clients = c; } @@ -291,59 +298,36 @@ attachstack(Client *c) { } void -ban(Client *c) { - if(c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - c->isbanned = True; -} - -void buttonpress(XEvent *e) { - unsigned int i, x; + 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) { - if(ev->button == Button1) { - if(ev->state & MODKEY) - tag(tags[i]); - else - view(tags[i]); - } - else if(ev->button == Button3) { - if(ev->state & MODKEY) - toggletag(tags[i]); - else - toggleview(tags[i]); - } - return; - } + 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; } - if((ev->x < x + blw) && ev->button == Button1) - togglelayout(NULL); + 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) - return; - if(ev->button == Button1) { - restack(); - movemouse(c); - } - else if(ev->button == Button2) { - if(lt->arrange && c->isfloating) - togglefloating(NULL); - } - else if(ev->button == Button3 && !c->isfixed) { - restack(); - 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 ? &arg : &buttons[i].arg); } void @@ -355,8 +339,7 @@ checkotherwm(void) { XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); XSync(dpy, False); if(otherwm) - eprint("dwm: another window manager is already running\n"); - XSync(dpy, False); + die("dwm: another window manager is already running\n"); XSetErrorHandler(NULL); xerrorxlib = XSetErrorHandler(xerror); XSync(dpy, False); @@ -364,11 +347,14 @@ checkotherwm(void) { void cleanup(void) { + Arg a = {.i = ~0}; + Layout foo = { "", NULL }; + close(STDIN_FILENO); - while(stack) { - unban(stack); + view(&a); + lt[sellt] = &foo; + while(stack) unmanage(stack); - } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); else @@ -385,6 +371,23 @@ cleanup(void) { } 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; @@ -424,7 +427,7 @@ configurerequest(XEvent *e) { if((c = getclient(ev->window))) { if(ev->value_mask & CWBorderWidth) c->bw = ev->border_width; - if(c->isfixed || 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) @@ -437,10 +440,9 @@ configurerequest(XEvent *e) { 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(isvisible(c)) + if(ISVISIBLE(c)) XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); } else @@ -470,13 +472,10 @@ destroynotify(XEvent *e) { 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 @@ -488,48 +487,60 @@ detachstack(Client *c) { } 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 && !isvisible(c); c = c->snext); for(i = 0; i < LENGTH(tags); i++) { - dc.w = textw(tags[i]); - if(tagset[seltags][i]) { - drawtext(tags[i], dc.sel, isurgent(i)); - drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel); - } - else { - drawtext(tags[i], dc.norm, isurgent(i)); - drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm); - } + dc.w = TEXTW(tags[i]); + 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, False); + drawtext(lt[sellt]->symbol, dc.norm, False); 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) { dc.x = x; - if(c) { - drawtext(c->name, dc.sel, False); - drawsquare(False, 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); } - 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); } @@ -556,8 +567,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { void drawtext(const char *text, unsigned long col[ColLast], Bool invert) { - int x, y, w, h; - unsigned int len, olen; + int i, x, y, h, len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; char buf[256]; @@ -568,22 +578,15 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) { 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); @@ -591,15 +594,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) { XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } -void * -emallocz(unsigned int size) { - void *res = calloc(1, size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - void enternotify(XEvent *e) { Client *c; @@ -614,16 +608,6 @@ enternotify(XEvent *e) { } 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; @@ -633,8 +617,8 @@ expose(XEvent *e) { void focus(Client *c) { - if(!c || (c && !isvisible(c))) - for(c = stack; c && !isvisible(c); 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]); @@ -643,14 +627,12 @@ focus(Client *c) { 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(); } @@ -663,30 +645,24 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */ } void -focusnext(const char *arg) { - Client *c; +focusstack(const Arg *arg) { + Client *c = NULL, *i; if(!sel) return; - for(c = sel->next; c && !isvisible(c); c = c->next); - if(!c) - for(c = clients; c && !isvisible(c); 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 char *arg) { - Client *c; - - if(!sel) - return; - for(c = sel->prev; c && !isvisible(c); c = c->prev); - if(!c) { - for(c = clients; c && c->next; c = c->next); - for(; c && !isvisible(c); 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); @@ -708,7 +684,7 @@ getcolor(const char *colstr) { 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; } @@ -758,25 +734,24 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { void grabbuttons(Client *c, Bool focused) { - int i, j; - unsigned int buttons[] = { Button1, Button2, Button3 }; - unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, - MODKEY|numlockmask|LockMask} ; + unsigned int i, j; + unsigned int 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 grabkeys(void) { unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; XModifierKeymap *modmap; @@ -792,25 +767,12 @@ grabkeys(void) { 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); + for(j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True, + GrabModeAsync, GrabModeAsync); } } -unsigned int -idxoftag(const char *t) { - unsigned int i; - - for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++); - return (i < LENGTH(tags)) ? i : 0; -} - void initfont(const char *fontstr) { char *def, **missing; @@ -844,7 +806,7 @@ initfont(const char *fontstr) { 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; } @@ -852,16 +814,6 @@ initfont(const char *fontstr) { } Bool -isoccupied(unsigned int t) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->tags[t]) - return True; - return False; -} - -Bool isprotodel(Client *c) { int i, n; Atom *protocols; @@ -876,26 +828,6 @@ isprotodel(Client *c) { return ret; } -Bool -isurgent(unsigned int t) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->isurgent && c->tags[t]) - return True; - return False; -} - -Bool -isvisible(Client *c) { - unsigned int i; - - for(i = 0; i < LENGTH(tags); i++) - if(c->tags[i] && tagset[seltags][i]) - return True; - return False; -} - void keypress(XEvent *e) { unsigned int i; @@ -906,15 +838,13 @@ keypress(XEvent *e) { 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 -killclient(const char *arg) { +killclient(const Arg *arg) { XEvent ev; if(!sel) @@ -939,8 +869,8 @@ manage(Window w, XWindowAttributes *wa) { Window trans; XWindowChanges wc; - c = emallocz(sizeof(Client)); - c->tags = emallocz(TAGSZ); + if(!(c = calloc(1, sizeof(Client)))) + die("fatal: could not calloc() %u bytes\n", sizeof(Client)); c->win = w; /* geometry */ @@ -952,15 +882,16 @@ manage(Window w, XWindowAttributes *wa) { 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 > wx + ww) - c->x = wx + ww - c->w - 2 * c->bw; - if(c->y + c->h + 2 * c->bw > wy + wh) - c->y = wy + wh - c->h - 2 * c->bw; - c->x = MAX(c->x, wx); - c->y = MAX(c->y, wy); + 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; + c->x = MAX(c->x, sx); + /* 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; } @@ -975,15 +906,16 @@ manage(Window w, XWindowAttributes *wa) { if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) for(t = clients; t && t->win != trans; t = t->next); if(t) - memcpy(c->tags, t->tags, TAGSZ); + c->tags = t->tags; else 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 */ - ban(c); + 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(); @@ -1012,18 +944,30 @@ maprequest(XEvent *e) { } void -movemouse(Client *c) { - int x1, y1, ocx, ocy, di, nx, ny; +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; if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; - XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); + XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui); for(;;) { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { @@ -1037,8 +981,8 @@ movemouse(Client *c) { 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) @@ -1049,10 +993,10 @@ movemouse(Client *c) { 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; } @@ -1060,8 +1004,8 @@ movemouse(Client *c) { } Client * -nextunfloating(Client *c) { - for(; c && (c->isfloating || !isvisible(c)); c = c->next); +nexttiled(Client *c) { + for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next); return c; } @@ -1098,7 +1042,7 @@ propertynotify(XEvent *e) { } void -quit(const char *arg) { +quit(const Arg *arg) { readin = running = False; } @@ -1116,12 +1060,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { 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 */ @@ -1136,11 +1079,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { 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) @@ -1153,6 +1096,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { 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->x = wc.x = x; c->y = wc.y = y; @@ -1167,11 +1114,15 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { } 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; if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, @@ -1199,11 +1150,11 @@ resizemouse(Client *c) { 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; } @@ -1219,13 +1170,13 @@ restack(void) { drawbar(); if(!sel) return; - if(sel->isfloating || !lt->arrange) + if(sel->isfloating || !lt[sellt]->arrange) XRaiseWindow(dpy, sel->win); - if(lt->arrange) { + if(lt[sellt]->arrange) { wc.stack_mode = Below; wc.sibling = barwin; for(c = stack; c; c = c->snext) - if(!c->isfloating && isvisible(c)) { + if(!c->isfloating && ISVISIBLE(c)) { XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); wc.sibling = c->win; } @@ -1246,7 +1197,6 @@ run(void) { /* 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 */ @@ -1258,7 +1208,7 @@ run(void) { 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))) { @@ -1330,19 +1280,48 @@ setclientstate(Client *c, long state) { } 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[sellt]->arrange) + return; + f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0; + if(f < 0.1 || f > 0.9) + return; + mfact = f; + arrange(); +} + +void setup(void) { - unsigned int 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 */ @@ -1359,28 +1338,21 @@ setup(void) { 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); if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); - /* init tags */ - tagset[0] = emallocz(TAGSZ); - tagset[1] = emallocz(TAGSZ); - tagset[0][0] = tagset[1][0] = True; - /* 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); } @@ -1388,7 +1360,7 @@ setup(void) { 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]); @@ -1401,7 +1373,7 @@ setup(void) { 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); @@ -1412,13 +1384,7 @@ setup(void) { } void -spawn(const char *arg) { - static char *shell = NULL; - - if(!shell && !(shell = getenv("SHELL"))) - shell = "/bin/sh"; - if(!arg) - return; +spawn(const Arg *arg) { /* The double-fork construct avoids zombie processes and keeps the code * clean from stupid signal handlers. */ if(fork() == 0) { @@ -1426,8 +1392,8 @@ spawn(const char *arg) { if(dpy) close(ConnectionNumber(dpy)); setsid(); - execl(shell, shell, "-c", arg, (char *)NULL); - fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg); + execvp(((char **)arg->v)[0], (char **)arg->v); + fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]); perror(" failed"); } exit(0); @@ -1436,18 +1402,14 @@ spawn(const char *arg) { } void -tag(const char *arg) { - unsigned int i; - - if(!sel) - return; - for(i = 0; i < LENGTH(tags); i++) - sel->tags[i] = (arg == NULL); - sel->tags[idxoftag(arg)] = True; - arrange(); +tag(const Arg *arg) { + if(sel && arg->ui & TAGMASK) { + sel->tags = arg->ui & TAGMASK; + arrange(); + } } -unsigned int +int textnw(const char *text, unsigned int len) { XRectangle r; @@ -1458,13 +1420,42 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -unsigned int -textw(const char *text) { - return textnw(text, strlen(text)) + dc.font.height; +void +tile(void) { + int x, y, h, w, mw; + unsigned int i, n; + Client *c; + + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++); + if(n == 0) + return; + + /* master */ + c = nexttiled(clients); + 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 = (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; + if(h < bh) + 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(h != wh) + y = c->y + c->h + 2 * c->bw; + } } void -togglebar(const char *arg) { +togglebar(const Arg *arg) { showbar = !showbar; updategeom(); updatebar(); @@ -1472,69 +1463,34 @@ togglebar(const char *arg) { } void -togglefloating(const char *arg) { +togglefloating(const Arg *arg) { if(!sel) return; - sel->isfloating = !sel->isfloating; + sel->isfloating = !sel->isfloating || sel->isfixed; if(sel->isfloating) resize(sel, sel->x, sel->y, sel->w, sel->h, True); arrange(); } void -togglelayout(const char *arg) { - unsigned int i; +toggletag(const Arg *arg) { + unsigned int mask = sel->tags ^ (arg->ui & TAGMASK); - if(!arg) { - if(++lt == &layouts[LENGTH(layouts)]) - lt = &layouts[0]; - } - else { - for(i = 0; i < LENGTH(layouts); i++) - if(!strcmp(arg, layouts[i].symbol)) - break; - if(i == LENGTH(layouts)) - return; - lt = &layouts[i]; - } - if(sel) + if(sel && mask) { + sel->tags = mask; arrange(); - else - drawbar(); -} - -void -toggletag(const char *arg) { - unsigned int i, j; - - if(!sel) - return; - i = idxoftag(arg); - sel->tags[i] = !sel->tags[i]; - for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++); - if(j == LENGTH(tags)) - sel->tags[i] = True; /* at least one tag must be enabled */ - arrange(); + } } void -toggleview(const char *arg) { - unsigned int i, j; +toggleview(const Arg *arg) { + unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK); - i = idxoftag(arg); - tagset[seltags][i] = !tagset[seltags][i]; - for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++); - if(j == LENGTH(tags)) - tagset[seltags][i] = True; /* at least one tag must be viewed */ - arrange(); -} - -void -unban(Client *c) { - if(!c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; + if(mask) { + tagset[seltags] = mask; + clearurgent(); + arrange(); + } } void @@ -1552,7 +1508,6 @@ unmanage(Client *c) { focus(NULL); XUngrabButton(dpy, AnyButton, AnyModifier, c->win); setclientstate(c, WithdrawnState); - free(c->tags); free(c); XSync(dpy, False); XSetErrorHandler(xerror); @@ -1573,33 +1528,44 @@ void 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 updategeom(void) { - unsigned int i; - -#ifdef CUSTOMGEOM /* define your own if you are Xinerama user */ - CUSTOMGEOM -#else - /* bar geometry*/ - bx = 0; - by = showbar ? (topbar ? 0 : sh - bh) : -bh; - bw = sw; +#ifdef XINERAMA + int n, i = 0; + XineramaScreenInfo *info = NULL; /* window area geometry */ - wx = sx; - wy = showbar && topbar ? sy + bh : sy; - ww = sw; - wh = showbar ? sh - bh : sh; + 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 #endif + { + wx = sx; + wy = showbar && topbar ? sy + bh : sy; + ww = sw; + wh = showbar ? sh - bh : sh; + } - /* update layout geometries */ - for(i = 0; i < LENGTH(layouts); i++) - if(layouts[i].updategeom) - layouts[i].updategeom(); + /* bar position */ + by = showbar ? (topbar ? wy - bh : wy + wh) : -bh; } void @@ -1607,49 +1573,45 @@ updatesizehints(Client *c) { 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); } @@ -1665,25 +1627,25 @@ updatewmhints(Client *c) { 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 char *arg) { - seltags ^= 1; /* toggle sel tagset */ - memset(tagset[seltags], (NULL == arg), TAGSZ); - tagset[seltags][idxoftag(arg)] = True; - arrange(); -} - -void -viewprevtag(const char *arg) { +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(); } @@ -1720,16 +1682,33 @@ xerrorstart(Display *dpy, XErrorEvent *ee) { return -1; } +void +zoom(const Arg *arg) { + Client *c = sel; + + if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating)) + return; + if(c == nexttiled(clients)) + if(!c || !(c = nexttiled(c->next))) + return; + detach(c); + attach(c); + focus(c); + arrange(); +} + 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();