Xinqi Bao's Git

projects / dwm.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (from parent 1: 3041010)
applied Martin Hurton's checkotherwm simplification
authorAnselm R Garbe <[email protected]>
Sat, 6 Sep 2008 07:59:51 +0000 (08:59 +0100)
committerAnselm R Garbe <[email protected]>
Sat, 6 Sep 2008 07:59:51 +0000 (08:59 +0100)
dwm.c patch | blob | history

diff --git a/dwm.c b/dwm.c
index 4ed5760..e7804dc 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -337,15 +337,14 @@ buttonpress(XEvent *e) {
 void
 checkotherwm(void) {
        otherwm = False;
 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)
                die("dwm: another window manager is already running\n");
 
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)
                die("dwm: another window manager is already running\n");
-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
+       XSetErrorHandler(xerror);
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 
@@ -1625,7 +1624,7 @@ updatesizehints(Client *c) {
        else
                c->maxa = c->mina = 0.0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
        else
                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
 }
 
 void