applied Ph's seltags-simplification with some modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index e1d3b0a..8c51275 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -41,6 +41,8 @@
 #include <X11/Xutil.h>
 
 /* macros */
+#define MAX(a, b) ((a)>(b)?(a):(b))
+#define MIN(a, b) ((a)<(b)?(a):(b))
 #define BUTTONMASK             (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask|LockMask))
 #define LENGTH(x)              (sizeof x / sizeof x[0])
@@ -212,6 +214,7 @@ char stext[256], buf[256];
 int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+int viewtags_set = 0;
 double mfact;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
@@ -231,22 +234,21 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
-Bool *prevtags;
 Bool *seltags;
+Bool *viewtags[2];
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Geom *geom = NULL;
-Layout *lt = NULL;
 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))
-static Bool tmp[LENGTH(tags)];
+Layout *lt = layouts;
+Geom *geom = geoms;
 
 /* function implementations */
 
@@ -261,10 +263,9 @@ applyrules(Client *c) {
        XGetClassHint(dpy, c->win, &ch);
        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];
-               if((r->title && strstr(c->name, r->title))
-               || (ch.res_class && r->class && strstr(ch.res_class, r->class))
-               || (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
-               {
+               if((!r->title || strstr(c->name, r->title))
+               && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+               && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                        c->isfloating = r->isfloating;
                        if(r->tag) {
                                c->tags[idxoftag(r->tag)] = True;
@@ -602,9 +603,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        if(!text)
                return;
        w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
+       olen = strlen(text);
+       len = MIN(olen, sizeof buf - 1);
        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;
@@ -881,10 +881,8 @@ initfont(const char *fontstr) {
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
+                       dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+                       dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
                        xfonts++;
                }
        }
@@ -1009,10 +1007,8 @@ manage(Window w, XWindowAttributes *wa) {
                        c->x = wx + ww - c->w - 2 * c->bw;
                if(c->y + c->h + 2 * c->bw > wy + wh)
                        c->y = wy + wh - c->h - 2 * c->bw;
-               if(c->x < wx)
-                       c->x = wx;
-               if(c->y < wy)
-                       c->y = wy;
+               c->x = MAX(c->x, wx);
+               c->y = MAX(c->y, wy);
                c->bw = BORDERPX;
        }
 
@@ -1068,7 +1064,7 @@ monocle(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
-               if((lt->isfloating || !c->floating) &&  isvisible(c))
+               if((lt->isfloating || !c->isfloating) &&  isvisible(c))
                        resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
 }
 
@@ -1162,11 +1158,10 @@ quit(const char *arg) {
 
 void
 reapply(const char *arg) {
-       static Bool zerotags[LENGTH(tags)] = { 0 };
        Client *c;
 
        for(c = clients; c; c = c->next) {
-               memcpy(c->tags, zerotags, sizeof zerotags);
+               memset(c->tags, 0, TAGSZ);
                applyrules(c);
        }
        arrange();
@@ -1178,10 +1173,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
        if(sizehints) {
                /* set minimum possible */
-               if(w < 1)
-                       w = 1;
-               if(h < 1)
-                       h = 1;
+               w = MAX(1, w);
+               h = MAX(1, h);
 
                /* temporarily remove base dimensions */
                w -= c->basew;
@@ -1207,14 +1200,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                w += c->basew;
                h += c->baseh;
 
-               if(c->minw > 0 && w < c->minw)
-                       w = c->minw;
-               if(c->minh > 0 && h < c->minh)
-                       h = c->minh;
-               if(c->maxw > 0 && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh > 0 && h > c->maxh)
-                       h = c->maxh;
+               w = MAX(w, c->minw);
+               h = MAX(h, c->minh);
+               
+               if (c->maxw)
+                       w = MIN(w, c->maxw);
+
+               if (c->maxh)
+                       h = MIN(h, c->maxh);
        }
        if(w <= 0 || h <= 0)
                return;
@@ -1267,10 +1260,8 @@ resizemouse(Client *c) {
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0)
-                               nw = 1;
-                       if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)
-                               nh = 1;
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                        if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
                                togglefloating(NULL);
                        if((lt->isfloating) || c->isfloating)
@@ -1483,7 +1474,6 @@ setup(void) {
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;
        mfact = MFACT;
-       geom = &geoms[0];
        geom->apply();
 
        /* init atoms */
@@ -1515,23 +1505,19 @@ setup(void) {
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* init tags */
-       seltags = emallocz(TAGSZ);
-       prevtags = emallocz(TAGSZ);
-       seltags[0] = prevtags[0] = True;
-
-       /* init layouts */
-       lt = &layouts[0];
+       viewtags[0] = emallocz(TAGSZ);
+       viewtags[1] = emallocz(TAGSZ);
+       viewtags[0][0] = viewtags[1][0] = True;
+       seltags = viewtags[0];
 
        /* init bar */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
                w = textw(layouts[i].symbol);
-               if(w > blw)
-                       blw = w;
+               blw = MAX(blw, w);
        }
        for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
                w = textw(geoms[i].symbol);
-               if(w > bgw)
-                       bgw = w;
+               bgw = MAX(bgw, w);
        }
 
        wa.override_redirect = 1;
@@ -1842,9 +1828,9 @@ updatewmhints(Client *c) {
        }
 }
 
-
 void
 view(const char *arg) {
+       Bool tmp[LENGTH(tags)];
        unsigned int i;
 
        for(i = 0; i < LENGTH(tags); i++)
@@ -1852,7 +1838,7 @@ view(const char *arg) {
        tmp[idxoftag(arg)] = True;
 
        if(memcmp(seltags, tmp, TAGSZ) != 0) {
-               memcpy(prevtags, seltags, TAGSZ);
+               seltags = viewtags[viewtags_set ^= 1];  /* toggle tagset */
                memcpy(seltags, tmp, TAGSZ);
                arrange();
        }
@@ -1860,10 +1846,7 @@ view(const char *arg) {
 
 void
 viewprevtag(const char *arg) {
-
-       memcpy(tmp, seltags, TAGSZ);
-       memcpy(seltags, prevtags, TAGSZ);
-       memcpy(prevtags, tmp, TAGSZ);
+       seltags = viewtags[viewtags_set ^= 1];  /* toggle tagset */
        arrange();
 }
 
@@ -1934,3 +1917,4 @@ main(int argc, char *argv[]) {
        XCloseDisplay(dpy);
        return 0;
 }
+