some changes towards 4.9

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 51d270e..3f896dc 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -96,10 +96,12 @@ typedef struct {
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;
-} Layout;
+} Layout; 
 
 typedef struct {
-       const char *prop;
+       const char *class;
+       const char *instance;
+       const char *title;
        const char *tag;
        Bool isfloating;
 } Rule;
@@ -116,6 +118,7 @@ void cleanup(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
+unsigned int counttiled(void);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
@@ -160,7 +163,7 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setdefaultgeoms(void);
+void setdefgeoms(void);
 void setlayout(const char *arg);
 void setup(void);
 void spawn(const char *arg);
@@ -169,7 +172,8 @@ unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 void tileh(void);
 void tilehstack(unsigned int n);
-unsigned int tilemaster(void);
+Client *tilemaster(unsigned int n);
+void tileresize(Client *c, int x, int y, int w, int h);
 void tilev(void);
 void tilevstack(unsigned int n);
 void togglefloating(const char *arg);
@@ -222,7 +226,6 @@ Display *dpy;
 DC dc = {0};
 Layout *lt = NULL;
 Window root, barwin;
-void (*setgeoms)(void) = setdefaultgeoms;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -242,9 +245,9 @@ applyrules(Client *c) {
        XGetClassHint(dpy, c->win, &ch);
        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];
-               if(strstr(c->name, r->prop)
-               || (ch.res_class && strstr(ch.res_class, r->prop))
-               || (ch.res_name && strstr(ch.res_name, r->prop)))
+               if(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)))
                {
                        c->isfloating = r->isfloating;
                        if(r->tag) {
@@ -457,6 +460,15 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
+unsigned int
+counttiled(void) {
+       unsigned int n;
+       Client *c;
+
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+       return n;
+}
+
 void
 destroynotify(XEvent *e) {
        Client *c;
@@ -1040,7 +1052,7 @@ maprequest(XEvent *e) {
 }
 
 void
-monocle(void) { 
+monocle(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
@@ -1379,7 +1391,7 @@ setclientstate(Client *c, long state) {
 }
 
 void
-setdefaultgeoms(void) {
+setdefgeoms(void) {
 
        /* screen dimensions */
        sx = 0;
@@ -1406,7 +1418,7 @@ setdefaultgeoms(void) {
        mh = wh;
 
        /* tile area */
-       tx = wx;
+       tx = mx + mw;
        ty = wy;
        tw = ww - mw;
        th = wh;
@@ -1577,90 +1589,77 @@ textw(const char *text) {
        return textnw(text, strlen(text)) + dc.font.height;
 }
 
-void
-tileresize(Client *c, int x, int y, int w, int h) {
-       resize(c, x, y, w, h, RESIZEHINTS);
-       if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
-               /* client doesn't accept size constraints */
-               resize(c, x, y, w, h, False);
-}
-
 void
 tileh(void) {
-       tilehstack(tilemaster());
-}
-
-void
-tilehstack(unsigned int n) {
-       int i, x, w;
+       int x, w;
+       unsigned int i, n = counttiled();
        Client *c;
 
        if(n == 0)
                return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;
 
        x = tx;
        w = tw / n;
        if(w < bh)
                w = tw;
 
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
-               if(i > 0) {
-                       if(i > 1 && i == n) /* remainder */
-                               tileresize(c, x, ty, (tx + tw) - x - 2 * c->border,
-                                             th - 2 * c->border);
-                       else
-                               tileresize(c, x, ty, w - 2 * c->border,
-                                             th - 2 * c->border);
-                       if(w != tw)
-                               x = c->x + c->w + 2 * c->border;
-               }
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, x, ty, (tx + tw) - x - 2 * c->border, th - 2 * c->border);
+               else
+                       tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border);
+               if(w != tw)
+                       x = c->x + c->w + 2 * c->border;
+       }
 }
 
-unsigned int
-tilemaster(void) {
-       unsigned int n;
-       Client *c, *mc;
+Client *
+tilemaster(unsigned int n) {
+       Client *c = nexttiled(clients);
 
-       for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-       if(n == 0)
-               return 0;
        if(n == 1)
-               tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border);
+               tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
        else
-               tileresize(mc, mx, my, mw - 2 * mc->border, mh - 2 * mc->border);
-       return n - 1;
+               tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+       return c;
 }
 
 void
-tilev(void) {
-       tilevstack(tilemaster());
+tileresize(Client *c, int x, int y, int w, int h) {
+       resize(c, x, y, w, h, RESIZEHINTS);
+       if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+               /* client doesn't accept size constraints */
+               resize(c, x, y, w, h, False);
 }
 
 void
-tilevstack(unsigned int n) {
-       int i, y, h;
+tilev(void) {
+       int y, h;
+       unsigned int i, n = counttiled();
        Client *c;
 
        if(n == 0)
                return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;
 
        y = ty;
        h = th / n;
        if(h < bh)
                h = th;
 
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
-               if(i > 0) {
-                       if(i > 1 && i == n) /* remainder */
-                               tileresize(c, tx, y, tw - 2 * c->border,
-                                             (ty + th) - y - 2 * c->border);
-                       else
-                               tileresize(c, tx, y, tw - 2 * c->border,
-                                             h - 2 * c->border);
-                       if(h != th)
-                               y = c->y + c->h + 2 * c->border;
-               }
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, tx, y, tw - 2 * c->border, (ty + th) - y - 2 * c->border);
+               else
+                       tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border);
+               if(h != th)
+                       y = c->y + c->h + 2 * c->border;
+       }
 }
 
 void