applied yiyus fix

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index edba139..c9c2994 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -15,7 +15,7 @@
  *
  * 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
+ * linked client list, the focus history is remembered through a global
  * stack list. Each client contains a bit array to indicate the tags of a
  * client.
  *
@@ -53,8 +53,8 @@
 #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 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)
 
@@ -138,7 +138,7 @@ static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);
-static void clearurgent(void);
+static void clearurgent(Client *c);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
@@ -365,20 +365,15 @@ cleanup(void) {
 }
 
 void
-clearurgent(void) {
+clearurgent(Client *c) {
        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);
-               }
+       c->isurgent = False;
+       if(!(wmh = XGetWMHints(dpy, c->win)))
+               return;
+       wmh->flags &= ~XUrgencyHint;
+       XSetWMHints(dpy, c->win, wmh);
+       XFree(wmh);
 }
 
 void
@@ -617,6 +612,8 @@ focus(Client *c) {
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
        }
        if(c) {
+               if(c->isurgent)
+                       clearurgent(c);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);
@@ -932,7 +929,7 @@ 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);
+               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
 }
 
 void
@@ -952,6 +949,8 @@ movemouse(const Arg *arg) {
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+       if(usegrab)
+               XGrabServer(dpy);
        do {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                switch (ev.type) {
@@ -961,7 +960,6 @@ movemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
-                       XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                        if(snap && nx >= wx && nx <= wx + ww
@@ -983,6 +981,8 @@ movemouse(const Arg *arg) {
                }
        }
        while(ev.type != ButtonRelease);
+       if(usegrab)
+               XUngrabServer(dpy);
        XUngrabPointer(dpy, CurrentTime);
 }
 
@@ -1121,6 +1121,8 @@ resizemouse(const Arg *arg) {
        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);
+       if(usegrab)
+               XGrabServer(dpy);
        do {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                switch(ev.type) {
@@ -1130,7 +1132,6 @@ resizemouse(const Arg *arg) {
                        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);
 
@@ -1146,6 +1147,8 @@ resizemouse(const Arg *arg) {
                }
        }
        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));
@@ -1435,7 +1438,7 @@ tile(void) {
        /* 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;
@@ -1449,8 +1452,8 @@ tile(void) {
                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);
+               resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+                      ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
                if(h != wh)
                        y = c->y + HEIGHT(c);
        }
@@ -1494,7 +1497,6 @@ toggleview(const Arg *arg) {
 
        if(mask) {
                tagset[seltags] = mask;
-               clearurgent();
                arrange();
        }
 }
@@ -1649,7 +1651,7 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
-               if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) {
+               if(c == sel && wmh->flags & XUrgencyHint) {
                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);
                }
@@ -1667,7 +1669,6 @@ view(const Arg *arg) {
        seltags ^= 1; /* toggle sel tagset */
        if(arg->ui & TAGMASK)
                tagset[seltags] = arg->ui & TAGMASK;
-       clearurgent();
        arrange();
 }