Jukka also belongs to Copyright holders after all he has contributed and done for...

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index d946309..aecf048 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,6 +1,9 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * © 2007 Premysl Hruby <dfenze at gmail dot com>
+ * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
@@ -12,7 +15,7 @@
 typedef struct {
        const char *prop;
        const char *tags;
-       Bool isversatile;
+       Bool isfloating;
 } Rule;
 
 typedef struct {
@@ -83,7 +86,7 @@ settags(Client *c, Client *trans) {
                                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;
@@ -102,49 +105,53 @@ settags(Client *c, Client *trans) {
 }
 
 void
-tag(Arg arg) {
-       unsigned int i;
+tag(const char *arg) {
+       int 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;
+               sel->tags[i] = arg == NULL;
+       i = arg ? atoi(arg) : 0;
+       if(i >= 0 && i < ntags)
+               sel->tags[i] = True;
        lt->arrange();
 }
 
 void
-toggletag(Arg arg) {
-       unsigned int i;
+toggletag(const char *arg) {
+       int i, j;
 
        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;
+       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;
        lt->arrange();
 }
 
 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 */
+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 */
        lt->arrange();
 }
 
 void
-view(Arg arg) {
-       unsigned int i;
+view(const char *arg) {
+       int 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;
+               seltag[i] = arg == NULL;
+       i = arg ? atoi(arg) : 0;
+       if(i >= 0 && i < ntags)
+               seltag[i] = True;
        lt->arrange();
 }