small bugfix

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index c069dcc..a532761 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,10 +1,10 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>
+#include <X11/Xatom.h>

 #include <X11/Xutil.h>
 
 /* static */
 #include <X11/Xutil.h>
 
 /* static */


@@ -12,7 +12,7 @@
 typedef struct {
        const char *prop;
        const char *tags;
 typedef struct {
        const char *prop;
        const char *tags;

-       Bool isversatile;
+       Bool isfloating;

 } Rule;
 
 typedef struct {
 } Rule;
 
 typedef struct {


@@ -25,6 +25,19 @@ RULES
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;

+static char prop[512];
+
+static void
+persisttags(Client *c)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+               prop[i] = c->tags[i] ? '+' : '-';
+       prop[i] = '\0';
+       XChangeProperty(dpy, c->win, dwmtags, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)prop, i);
+}

 
 /* extern */
 
 
 /* extern */
 


@@ -67,23 +80,38 @@ isvisible(Client *c) {
 
 void
 settags(Client *c, Client *trans) {
 
 void
 settags(Client *c, Client *trans) {

-       char prop[512];

        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        XClassHint ch = { 0 };
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        XClassHint ch = { 0 };

+       XTextProperty name;

 
 

-       if(matched)
+       if(matched) {

                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];

+       }

        else {
        else {

+               /* check if window has set a property */
+               name.nitems = 0;
+               XGetTextProperty(dpy, c->win, &name, dwmtags);
+               if(name.nitems && name.encoding == XA_STRING) {
+                       strncpy(prop, (char *)name.value, sizeof prop - 1);
+                       prop[sizeof prop - 1] = '\0';
+                       XFree(name.value);
+                       for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
+                               if((c->tags[i] = prop[i] == '+'))
+                                       matched = True;
+               }
+       }
+       if(!matched) {
+               /* rule matching */

                XGetClassHint(dpy, c->win, &ch);
                snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
                XGetClassHint(dpy, c->win, &ch);
                snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {

-                               c->isversatile = rule[i].isversatile;
+                               c->isfloating = rule[i].isfloating;

                                for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                        if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;
                                for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                        if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;


@@ -99,52 +127,61 @@ settags(Client *c, Client *trans) {
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];

+       persisttags(c);

 }
 
 void
 }
 
 void

-tag(Arg *arg) {
-       unsigned int i;
+tag(const char *arg) {
+       int i;

 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)

-               sel->tags[i] = (arg->i == -1) ? True : False;
-       if(arg->i >= 0 && arg->i < ntags)
-               sel->tags[arg->i] = True;
-       lt->arrange();
+               sel->tags[i] = arg == NULL;
+       i = arg ? atoi(arg) : 0;
+       if(i >= 0 && i < ntags)
+               sel->tags[i] = True;
+       if(sel)
+               persisttags(sel);
+       arrange();

 }
 
 void
 }
 
 void

-toggletag(Arg *arg) {
-       unsigned int i;
+toggletag(const char *arg) {
+       int i, j;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       sel->tags[arg->i] = !sel->tags[arg->i];
-       for(i = 0; i < ntags && !sel->tags[i]; i++);
-       if(i == ntags)
-               sel->tags[arg->i] = True;
-       lt->arrange();
+       i = arg ? atoi(arg) : 0;
+       sel->tags[i] = !sel->tags[i];
+       for(j = 0; j < ntags && !sel->tags[j]; j++);
+       if(j == ntags)
+               sel->tags[i] = True;
+       if(sel)
+               persisttags(sel);
+       arrange();

 }
 
 void
 }
 
 void

-toggleview(Arg *arg) {
-       unsigned int i;
-
-       seltag[arg->i] = !seltag[arg->i];
-       for(i = 0; i < ntags && !seltag[i]; i++);
-       if(i == ntags)
-               seltag[arg->i] = True; /* cannot toggle last view */
-       lt->arrange();
+toggleview(const char *arg) {
+       int i, j;
+
+       i = arg ? atoi(arg) : 0;
+       seltag[i] = !seltag[i];
+       for(j = 0; j < ntags && !seltag[j]; j++);
+       if(j == ntags)
+               seltag[i] = True; /* cannot toggle last view */
+       arrange();

 }
 
 void
 }
 
 void

-view(Arg *arg) {
-       unsigned int i;
+view(const char *arg) {
+       int i;

 
        for(i = 0; i < ntags; i++)
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = (arg->i == -1) ? True : False;
-       if(arg->i >= 0 && arg->i < ntags)
-               seltag[arg->i] = True;
-       lt->arrange();
+               seltag[i] = arg == NULL;
+       i = arg ? atoi(arg) : 0;
+       if(i >= 0 && i < ntags)
+               seltag[i] = True;
+       arrange();

 }
 }