renamed eprint die

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 0691029..e077454 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -145,11 +145,11 @@ static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
+static void die(const char *errstr, ...);
 static void drawbar(void);
 static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
 static void drawtext(const char *text, ulong col[ColLast], Bool invert);
 static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
@@ -343,7 +343,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);
@@ -459,16 +459,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
@@ -479,6 +473,16 @@ detachstack(Client *c) {
        *tc = c->snext;
 }
 
+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;
@@ -586,16 +590,6 @@ enternotify(XEvent *e) {
                focus(NULL);
 }
 
-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;
@@ -673,7 +667,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;
 }
 
@@ -723,19 +717,18 @@ 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 };
+       uint i, j;
+       uint modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       if(focused)
+       if(focused) {
                for(i = 0; i < LENGTH(buttons); i++)
-                       for(j = 0; j < LENGTH(modifiers); j++)
-                               XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-                                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-       else
+                       if(buttons[i].click == ClkClientWin)
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+        } else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
@@ -800,7 +793,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;
        }
@@ -884,7 +877,7 @@ manage(Window w, XWindowAttributes *wa) {
        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 */
@@ -1223,7 +1216,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))) {
@@ -1643,6 +1636,8 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
+       if(arg && (arg->i & TAGMASK) == tagset[seltags])
+               return;
        seltags ^= 1; /* toggle sel tagset */
        if(arg && (arg->ui & TAGMASK))
                tagset[seltags] = arg->i & TAGMASK;
@@ -1700,15 +1695,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(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "warning: no locale support\n");
 
        if(!(dpy = XOpenDisplay(0)))
-               eprint("dwm: cannot open display\n");
+               die("dwm: cannot open display\n");
 
        checkotherwm();
        setup();