cleaned up code

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index fce3c6e..186a5ae 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -4,15 +4,25 @@
  */
 #include "dwm.h"
 
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
 /* static */
 
+typedef struct {
+       const char *pattern;
+       char *tags[TLast];
+       Bool isfloat;
+} Rule;
+
 /* CUSTOMIZE */ 
 static Rule rule[] = {
-       /* class                        instance        tags                                            isfloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
+       /* class:instance       tags                            isfloat */
+       { "Firefox.*",          { [Twww] = "www" },             False },
+       { "Gimp.*",             { 0 },                          True},
 };
 
 /* extern */
@@ -43,8 +53,9 @@ dofloat(Arg *arg)
 
        arrange = dofloat;
        for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
+               if(c->tags[tsel]) {
+                       resize(c, True, TopLeft);
+               }
                else
                        ban(c);
        }
@@ -60,8 +71,8 @@ dofloat(Arg *arg)
 void
 dotile(Arg *arg)
 {
-       Client *c;
        int n, i, w, h;
+       Client *c;
 
        w = sw - mw;
        arrange = dotile;
@@ -78,7 +89,7 @@ dotile(Arg *arg)
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
-                               resize(c, True);
+                               resize(c, True, TopLeft);
                                continue;
                        }
                        if(n == 1) {
@@ -93,13 +104,19 @@ dotile(Arg *arg)
                                c->w = mw - 2 * c->border;
                                c->h = sh - 2 * c->border - bh;
                        }
-                       else {
+                       else if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
                                c->w = w - 2 * c->border;
                                c->h = h - 2 * c->border;
                        }
-                       resize(c, False);
+                       else { /* fallback if h < bh */
+                               c->x = sx + mw;
+                               c->y = sy + bh;
+                               c->w = w - 2 * c->border;
+                               c->h = sh - 2 * c->border - bh;
+                       }
+                       resize(c, False, TopLeft);
                        i++;
                }
                else
@@ -144,6 +161,7 @@ void
 replacetag(Arg *arg)
 {
        int i;
+
        if(!sel)
                return;
 
@@ -155,10 +173,13 @@ replacetag(Arg *arg)
 void
 settags(Client *c)
 {
-       XClassHint ch;
+       char classinst[256];
        static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
        unsigned int i, j;
+       regex_t regex;
+       regmatch_t tmp;
        Bool matched = False;
+       XClassHint ch;
 
        if(!len) {
                c->tags[tsel] = tags[tsel];
@@ -166,24 +187,27 @@ settags(Client *c)
        }
 
        if(XGetClassHint(dpy, c->win, &ch)) {
-               if(ch.res_class && ch.res_name) {
-                       for(i = 0; i < len; i++)
-                               if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-                                       && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-                               {
-                                       for(j = 0; j < TLast; j++)
+               snprintf(classinst, sizeof(classinst), "%s:%s",
+                               ch.res_class ? ch.res_class : "",
+                               ch.res_name ? ch.res_name : "");
+               for(i = 0; !matched && i < len; i++) {
+                       if(!regcomp(&regex, rule[i].pattern, 0)) {
+                               if(!regexec(&regex, classinst, 1, &tmp, 0)) {
+                                       for(j = 0; j < TLast; j++) {
+                                               if(rule[i].tags[j])
+                                                       matched = True;
                                                c->tags[j] = rule[i].tags[j];
+                                       }
                                        c->isfloat = rule[i].isfloat;
-                                       matched = True;
-                                       break;
                                }
+                               regfree(&regex);
+                       }
                }
                if(ch.res_class)
                        XFree(ch.res_class);
                if(ch.res_name)
                        XFree(ch.res_name);
        }
-
        if(!matched)
                c->tags[tsel] = tags[tsel];
 }