applied Frederik Ternerot's grabbuttons patch with slight modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5211ece..e135715 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -53,13 +53,14 @@
 #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])
 
 /* enums */
 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 { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 
 /* typedefs */
@@ -89,7 +90,7 @@ struct Client {
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        uint tags;
-       Bool isbanned, isfixed, isfloating, isurgent;
+       Bool isfixed, isfloating, isurgent;
        Client *next;
        Client *snext;
        Window win;
@@ -273,14 +274,13 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
-               if(c->tags & tagset[seltags]) { /* is visible */
+               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);
-                       c->isbanned = False;
                }
-               else if(!c->isbanned) {
+               else {
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-                       c->isbanned = True;
                }
 
        focus(NULL);
@@ -304,17 +304,18 @@ attachstack(Client *c) {
 void
 buttonpress(XEvent *e) {
        uint i, x, click;
+       Arg arg = {0};
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
        if(ev->window == barwin) {
                i = x = 0;
-               do
-                       x += TEXTW(tags[i]);
-               while(ev->x >= x && ++i < LENGTH(tags));
-               if(i < LENGTH(tags))
-                       click = i;
+               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+               if(i < LENGTH(tags)) {
+                       click = ClkTagBar;
+                       arg.ui = 1 << i;
+               }
                else if(ev->x < x + blw)
                        click = ClkLtSymbol;
                else if(ev->x > wx + ww - TEXTW(stext))
@@ -330,7 +331,7 @@ buttonpress(XEvent *e) {
        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(&buttons[i].arg);
+                       buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
 }
 
 void
@@ -428,7 +429,7 @@ configurerequest(XEvent *e) {
                                c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
-                       if(!c->isbanned)
+                       if(ISVISIBLE(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else
@@ -481,19 +482,17 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, x;
-       Client *c;
 
        dc.x = 0;
-       for(c = stack; c && c->isbanned; c = c->snext);
        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(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
                }
                else {
                        drawtext(tags[i], dc.norm, isurgent(i));
-                       drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
                }
                dc.x += dc.w;
        }
@@ -513,9 +512,9 @@ drawbar(void) {
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
-               if(c) {
-                       drawtext(c->name, dc.sel, False);
-                       drawsquare(c->isfixed, 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);
@@ -607,8 +606,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-       if(!c || c->isbanned)
-               for(c = stack; c && c->isbanned; 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]);
@@ -641,17 +640,17 @@ focusstack(const Arg *arg) {
        if(!sel)
                return;
        if (arg->i > 0) {
-               for(c = sel->next; c && c->isbanned; c = c->next);
+               for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
                if(!c)
-                       for(c = clients; c && c->isbanned; c = c->next);
+                       for(c = clients; c && !ISVISIBLE(c); c = c->next);
        }
        else {
                for(i = clients; i != sel; i = i->next)
-                       if (!i->isbanned)
+                       if(ISVISIBLE(i))
                                c = i;
                if(!c)
                        for(; i; i = i->next)
-                               if (!i->isbanned)
+                               if(ISVISIBLE(i))
                                        c = i;
        }
        if(c) {
@@ -724,19 +723,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
@@ -930,7 +928,7 @@ manage(Window w, XWindowAttributes *wa) {
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+       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();
@@ -963,7 +961,7 @@ 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
@@ -1020,7 +1018,7 @@ movemouse(const Arg *arg) {
 
 Client *
 nexttiled(Client *c) {
-       for(; c && (c->isfloating || c->isbanned); c = c->next);
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
        return c;
 }
 
@@ -1115,7 +1113,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                h = bh;
        if(w < bh)
                w = bh;
-       if(!c->isbanned || c->x != x || c->y != y || c->w != w || c->h != h) {
+       if(c->x != x || c->y != y || c->w != w || c->h != h) {
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
@@ -1191,7 +1189,7 @@ restack(void) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)
-                       if(!c->isfloating && !c->isbanned) {
+                       if(!c->isfloating && ISVISIBLE(c)) {
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }
@@ -1297,8 +1295,9 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const Arg *arg) {
-       sellt ^= 1;
-       if(arg && arg->v && arg->v != lt[sellt])
+       if(!arg || !arg->v || arg->v != lt[sellt])
+               sellt ^= 1;
+       if(arg && arg->v)
                lt[sellt] = (Layout *)arg->v;
        if(sel)
                arrange();
@@ -1704,7 +1703,9 @@ main(int argc, char *argv[]) {
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
-       setlocale(LC_CTYPE, "");
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "warning: no locale support\n");
+
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");