applied nibbles fixes, slightly modified

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 3147be2..2851929 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -16,8 +16,8 @@
  * 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
- * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.
+ * stack list. Each client contains a bit array to indicate the tags of a
+ * client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
@@ -53,7 +53,6 @@
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
-#define VISIBLE(x)      ((x)->tags & tagset[seltags])
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
@@ -72,7 +71,7 @@ struct Client {
        int minax, maxax, minay, maxay;
        long flags;
        int bw, oldbw;
-       Bool isbanned, isfixed, isfloating, ismax, isurgent;
+       Bool isbanned, isfixed, isfloating, ismoved, isurgent;
        uint tags;
        Client *next;
        Client *prev;
@@ -193,7 +192,7 @@ void zoom(const void *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int by, bh, blw, wx, wy, ww, wh;
 uint seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 uint numlockmask = 0;
@@ -263,13 +262,18 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
-               if(VISIBLE(c)) {
-                       if(!lt->arrange || c->isfloating)
+               if(c->tags & tagset[seltags]) { /* is visible */
+                       if(ismax && !c->isfixed) {
+                               XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+                               c->ismoved = True;
+                       }
+                       else if(!lt->arrange || ismax || c->isfloating)
                                resize(c, c->x, c->y, c->w, c->h, True);
+                       c->isbanned = False;
                }
                else if(!c->isbanned) {
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-                       c->isbanned = True;
+                       c->isbanned = c->ismoved = True;
                }
 
        focus(NULL);
@@ -328,7 +332,7 @@ buttonpress(XEvent *e) {
        }
        else if((c = getclient(ev->window))) {
                focus(c);
-               if(CLEANMASK(ev->state) != MODKEY || ismax)
+               if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
                        return;
                if(ev->button == Button1)
                        movemouse(c);
@@ -349,7 +353,6 @@ checkotherwm(void) {
        XSync(dpy, False);
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
-       XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
@@ -358,7 +361,7 @@ checkotherwm(void) {
 void
 cleanup(void) {
        close(STDIN_FILENO);
-       view(NULL);
+       view((uint[]){~0});
        while(stack)
                unmanage(stack);
        if(dc.font.set)
@@ -432,7 +435,7 @@ configurerequest(XEvent *e) {
                        if((ev->value_mask & (CWX|CWY))
                        && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
-                       if(VISIBLE(c))
+                       if(!c->isbanned)
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else
@@ -485,7 +488,7 @@ drawbar(void) {
        Client *c;
 
        dc.x = 0;
-       for(c = stack; c && !VISIBLE(c); c = c->snext);
+       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) {
@@ -506,22 +509,22 @@ drawbar(void) {
        else
                x = dc.x;
        dc.w = TEXTW(stext);
-       dc.x = bw - dc.w;
+       dc.x = ww - dc.w;
        if(dc.x < x) {
                dc.x = x;
-               dc.w = bw - x;
+               dc.w = ww - x;
        }
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                if(c) {
                        drawtext(c->name, dc.sel, False);
-                       drawsquare(False, c->isfloating, False, dc.sel);
+                       drawsquare(c->isfixed, c->isfloating, False, dc.sel);
                }
                else
                        drawtext(NULL, dc.norm, False);
        }
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
        XSync(dpy, False);
 }
 
@@ -616,8 +619,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-       if(!c || (c && !VISIBLE(c)))
-               for(c = stack; c && !VISIBLE(c); c = c->snext);
+       if(!c || (c && c->isbanned))
+               for(c = stack; c && c->isbanned; c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -629,10 +632,6 @@ focus(Client *c) {
        }
        sel = c;
        if(c) {
-               if(ismax) {
-                       XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
-                       c->ismax = True;
-               }
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
@@ -655,9 +654,9 @@ focusnext(const void *arg) {
 
        if(!sel)
                return;
-       for(c = sel->next; c && !VISIBLE(c); c = c->next);
+       for(c = sel->next; c && c->isbanned; c = c->next);
        if(!c)
-               for(c = clients; c && !VISIBLE(c); c = c->next);
+               for(c = clients; c && c->isbanned; c = c->next);
        if(c) {
                focus(c);
                restack();
@@ -670,10 +669,10 @@ focusprev(const void *arg) {
 
        if(!sel)
                return;
-       for(c = sel->prev; c && !VISIBLE(c); c = c->prev);
+       for(c = sel->prev; c && c->isbanned; c = c->prev);
        if(!c) {
                for(c = clients; c && c->next; c = c->next);
-               for(; c && !VISIBLE(c); c = c->prev);
+               for(; c && c->isbanned; c = c->prev);
        }
        if(c) {
                focus(c);
@@ -875,11 +874,9 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
+                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                  && keys[i].func)
+                       keys[i].func(keys[i].arg);
 }
 
 void
@@ -1030,7 +1027,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
-       for(; c && (c->isfloating || !VISIBLE(c)); c = c->next);
+       for(; c && (c->isfloating || c->isbanned); c = c->next);
        return c;
 }
 
@@ -1126,8 +1123,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                h = bh;
        if(w < bh)
                w = bh;
-       if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
-               c->isbanned = c->ismax = False;
+       if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
+               c->isbanned = c->ismoved = False;
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
@@ -1200,7 +1197,7 @@ restack(void) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)
-                       if(!c->isfloating && VISIBLE(c)) {
+                       if(!c->isfloating && !c->isbanned) {
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }
@@ -1372,7 +1369,7 @@ setup(void) {
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
-       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@ -1482,7 +1479,7 @@ void
 togglefloating(const void *arg) {
        if(!sel)
                return;
-       sel->isfloating = !sel->isfloating;
+       sel->isfloating = !sel->isfloating || sel->isfixed;
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
@@ -1567,8 +1564,8 @@ void
 updatebar(void) {
        if(dc.drawable != 0)
                XFreePixmap(dpy, dc.drawable);
-       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
 }
 
 void
@@ -1595,10 +1592,8 @@ updategeom(void) {
                wh = showbar ? sh - bh : sh;
        }
 
-       /* bar geometry */
-       bx = wx;
+       /* bar position */
        by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
-       bw = ww;
 }
 
 void
@@ -1724,7 +1719,7 @@ void
 zoom(const void *arg) {
        Client *c = sel;
 
-       if(!lt->arrange || sel->isfloating)
+       if(ismax || !lt->arrange || (sel && sel->isfloating))
                return;
        if(c == nexttiled(clients))
                if(!c || !(c = nexttiled(c->next)))