X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=293f9cfb2f5c8de60ba621450388c7e064324395;hp=188e445d208ce7aeb733b5916261da5e820a844e;hb=02a8ca95cf22d9b1da50dffffefa31fb563c3852;hpb=277155cf775369ad9645e68da59339acdc8f1117 diff --git a/dwm.c b/dwm.c index 188e445..293f9cf 100644 --- a/dwm.c +++ b/dwm.c @@ -24,7 +24,6 @@ * To understand everything else, start reading main(). */ #include -#include #include #include #include @@ -44,16 +43,17 @@ #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 ISVISIBLE(x) (x->tags & tagset[seltags]) +#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 { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -63,21 +63,17 @@ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ -/* typedefs */ -typedef unsigned int uint; -typedef unsigned long ulong; - typedef union { int i; - uint ui; + unsigned int ui; float f; void *v; } Arg; typedef struct { - uint click; - uint mask; - uint button; + unsigned int click; + unsigned int mask; + unsigned int button; void (*func)(const Arg *arg); const Arg arg; } Button; @@ -89,7 +85,7 @@ struct Client { int x, y, w, h; int basew, baseh, incw, inch, maxw, maxh, minw, minh; int bw, oldbw; - uint tags; + unsigned int tags; Bool isfixed, isfloating, isurgent; Client *next; Client *snext; @@ -98,8 +94,8 @@ struct Client { 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 { @@ -112,7 +108,7 @@ typedef struct { } DC; /* draw context */ typedef struct { - uint mod; + unsigned int mod; KeySym keysym; void (*func)(const Arg *); const Arg arg; @@ -127,7 +123,7 @@ typedef struct { const char *class; const char *instance; const char *title; - uint tags; + unsigned int tags; Bool isfloating; } Rule; @@ -139,31 +135,30 @@ 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, ulong col[ColLast]); -static void drawtext(const char *text, ulong col[ColLast], Bool invert); +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 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 unsigned long getcolor(const char *colstr); static long getstate(Window w); -static Bool gettextprop(Window w, Atom atom, char *text, uint size); +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 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); @@ -185,7 +180,7 @@ 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 int textnw(const char *text, unsigned int len); static void tile(void); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); @@ -206,11 +201,13 @@ static void zoom(const Arg *arg); /* variables */ static char stext[256]; -static int screen, sx, sy, sw, sh; -static int by, bh, blw, wx, wy, ww, wh; -static uint seltags = 0, sellt = 0; +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 uint numlockmask = 0; +static unsigned int numlockmask = 0; static void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, [ConfigureRequest] = configurerequest, @@ -226,9 +223,9 @@ static void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; static Atom wmatom[WMLast], netatom[NetLast]; -static Bool otherwm, readin; +static Bool otherwm; static Bool running = True; -static uint tagset[] = {1, 1}; /* after start, first tag is selected */ +static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */ static Client *clients = NULL; static Client *sel = NULL; static Client *stack = NULL; @@ -240,13 +237,13 @@ 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 }; @@ -303,7 +300,7 @@ attachstack(Client *c) { void buttonpress(XEvent *e) { - uint i, x, click; + unsigned int i, x, click; Arg arg = {0}; Client *c; XButtonPressedEvent *ev = &e->xbutton; @@ -343,7 +340,7 @@ checkotherwm(void) { XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); XSync(dpy, False); if(otherwm) - eprint("dwm: another window manager is already running\n"); + die("dwm: another window manager is already running\n"); XSetErrorHandler(NULL); xerrorxlib = XSetErrorHandler(xerror); XSync(dpy, False); @@ -351,7 +348,7 @@ checkotherwm(void) { void cleanup(void) { - Arg a = {.i = ~0}; + Arg a = {.ui = ~0}; Layout foo = { "", NULL }; close(STDIN_FILENO); @@ -375,6 +372,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; @@ -459,16 +473,10 @@ destroynotify(XEvent *e) { void detach(Client *c) { - Client *i; + Client **tc; - if (c != clients) { - for(i = clients; i->next != c; i = i->next); - i->next = c->next; - } - else { - clients = c->next; - } - c->next = NULL; + for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next); + *tc = c->next; } void @@ -480,20 +488,34 @@ 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(i = 0; i < LENGTH(tags); i++) { dc.w = TEXTW(tags[i]); - if(tagset[seltags] & 1 << i) { - drawtext(tags[i], dc.sel, isurgent(i)); - drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); - } - else { - drawtext(tags[i], dc.norm, isurgent(i)); - drawsquare(sel && sel->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) { @@ -524,7 +546,7 @@ drawbar(void) { } 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 }; @@ -545,25 +567,24 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) { } void -drawtext(const char *text, ulong col[ColLast], Bool invert) { +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 }; - char buf[256]; 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); 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 && (i = textnw(buf, len)) > dc.w - h; len--); + for(len = MIN(olen, sizeof buf); len && textnw(buf, len) > dc.w - h; len--); if(!len) return; + memcpy(buf, text, len); if(len < olen) for(i = len; i && i > len - 3; buf[--i] = '.'); XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]); @@ -587,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; @@ -667,13 +678,13 @@ getclient(Window w) { 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; } @@ -682,7 +693,7 @@ getstate(Window w) { 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], @@ -696,7 +707,7 @@ getstate(Window w) { } 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; @@ -723,24 +734,24 @@ gettextprop(Window w, Atom atom, char *text, uint size) { void grabbuttons(Client *c, Bool focused) { - int i, j; - uint buttons[] = { Button1, Button2, Button3 }; - uint 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) { - uint i, j; + unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; XModifierKeymap *modmap; @@ -756,14 +767,9 @@ 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); } } @@ -800,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; } @@ -808,16 +814,6 @@ initfont(const char *fontstr) { } 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; @@ -832,19 +828,9 @@ isprotodel(Client *c) { 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; @@ -879,12 +865,11 @@ killclient(const Arg *arg) { void manage(Window w, XWindowAttributes *wa) { 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)); + die("fatal: could not calloc() %u bytes\n", sizeof(Client)); c->win = w; /* geometry */ @@ -896,7 +881,7 @@ 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 > sx + sw) @@ -917,14 +902,14 @@ manage(Window w, XWindowAttributes *wa) { 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); @@ -962,13 +947,13 @@ monocle(void) { Client *c; for(c = nexttiled(clients); c; c = nexttiled(c->next)) - resize(c, wx, wy, ww, wh, resizehints); + resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints); } void movemouse(const Arg *arg) { - int x1, y1, ocx, ocy, di, nx, ny; - uint dui; + int x, y, ocx, ocy, di, nx, ny; + unsigned int dui; Client *c; Window dummy; XEvent ev; @@ -976,18 +961,15 @@ movemouse(const Arg *arg) { 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); + do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; case ConfigureRequest: case Expose: case MapRequest: @@ -995,8 +977,8 @@ movemouse(const Arg *arg) { 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) @@ -1015,6 +997,8 @@ movemouse(const Arg *arg) { break; } } + while(ev.type != ButtonRelease); + XUngrabPointer(dpy, CurrentTime); } Client * @@ -1205,13 +1189,12 @@ run(void) { 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 */ @@ -1223,7 +1206,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))) { @@ -1261,11 +1244,10 @@ run(void) { 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) @@ -1281,9 +1263,9 @@ scan(void) { && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)) manage(wins[i], &wa); } + if(wins) + XFree(wins); } - if(wins) - XFree(wins); } void @@ -1322,7 +1304,7 @@ setmfact(const Arg *arg) { void setup(void) { - uint i; + unsigned int i; int w; XSetWindowAttributes wa; @@ -1425,7 +1407,7 @@ tag(const Arg *arg) { } int -textnw(const char *text, uint len) { +textnw(const char *text, unsigned int len) { XRectangle r; if(dc.font.set) { @@ -1438,7 +1420,7 @@ textnw(const char *text, uint len) { 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++); @@ -1489,7 +1471,7 @@ togglefloating(const Arg *arg) { void toggletag(const Arg *arg) { - uint mask = sel->tags ^ (arg->ui & TAGMASK); + unsigned int mask = sel->tags ^ (arg->ui & TAGMASK); if(sel && mask) { sel->tags = mask; @@ -1499,10 +1481,11 @@ toggletag(const Arg *arg) { void toggleview(const Arg *arg) { - uint mask = tagset[seltags] ^ (arg->ui & TAGMASK); + unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK); if(mask) { tagset[seltags] = mask; + clearurgent(); arrange(); } } @@ -1549,16 +1532,24 @@ updatebar(void) { void updategeom(void) { #ifdef XINERAMA - int i; + int n, i = 0; XineramaScreenInfo *info = NULL; /* window area geometry */ - if(XineramaIsActive(dpy)) { - info = XineramaQueryScreens(dpy, &i); - wx = info[xidx].x_org; - wy = showbar && topbar ? info[xidx].y_org + bh : info[xidx].y_org; - ww = info[xidx].width; - wh = showbar ? info[xidx].height - bh : info[xidx].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 @@ -1633,19 +1624,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 Arg *arg) { + if((arg->ui & TAGMASK) == tagset[seltags]) + return; seltags ^= 1; /* toggle sel tagset */ - if(arg && (arg->ui & TAGMASK)) - tagset[seltags] = arg->i & TAGMASK; + if(arg->ui & TAGMASK) + tagset[seltags] = arg->ui & TAGMASK; + clearurgent(); arrange(); } @@ -1700,13 +1697,15 @@ zoom(const Arg *arg) { 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(!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();