some cleanups/fixes inspired by Jukka Salmi's feedback

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 186a5ae..67e2498 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -21,21 +21,24 @@ typedef struct {
 /* CUSTOMIZE */ 
 static Rule rule[] = {
        /* class:instance       tags                            isfloat */
 /* CUSTOMIZE */ 
 static Rule rule[] = {
        /* class:instance       tags                            isfloat */

-       { "Firefox.*",          { [Twww] = "www" },             False },
+       { "Firefox.*",          { [Tnet] = "net" },             False },

        { "Gimp.*",             { 0 },                          True},
 };
 
        { "Gimp.*",             { 0 },                          True},
 };
 

-/* extern */
-
-/* CUSTOMIZE */

 char *tags[TLast] = {
 char *tags[TLast] = {

-       [Tscratch] = "scratch",
+       [Tfnord] = "fnord",

        [Tdev] = "dev",
        [Tdev] = "dev",

-       [Twww] = "www",
+       [Tnet] = "net",

        [Twork] = "work",
        [Twork] = "work",

+       [Tmisc] = "misc",

 };
 };

+

 void (*arrange)(Arg *) = dotile;
 
 void (*arrange)(Arg *) = dotile;
 

+/* END CUSTOMIZE */
+
+/* extern */
+

 void
 appendtag(Arg *arg)
 {
 void
 appendtag(Arg *arg)
 {


@@ -51,8 +54,8 @@ dofloat(Arg *arg)
 {
        Client *c;
 
 {
        Client *c;
 

-       arrange = dofloat;

        for(c = clients; c; c = c->next) {
        for(c = clients; c; c = c->next) {

+               c->ismax = False;

                if(c->tags[tsel]) {
                        resize(c, True, TopLeft);
                }
                if(c->tags[tsel]) {
                        resize(c, True, TopLeft);
                }


@@ -75,7 +78,6 @@ dotile(Arg *arg)
        Client *c;
 
        w = sw - mw;
        Client *c;
 
        w = sw - mw;

-       arrange = dotile;

        for(n = 0, c = clients; c; c = c->next)
                if(c->tags[tsel] && !c->isfloat)
                        n++;
        for(n = 0, c = clients; c; c = c->next)
                if(c->tags[tsel] && !c->isfloat)
                        n++;


@@ -86,6 +88,7 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {

+               c->ismax = False;

                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);


@@ -138,23 +141,11 @@ getnext(Client *c, unsigned int t)
        return c;
 }
 
        return c;
 }
 

-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)

 {
 {

-       int i;
-       Client *c;
-
-       if(arg->i == tsel)
-               return;
-
-       if(!(c = getnext(clients, arg->i)))
-               return;
-
-       for(i = 0; i < TLast; i++)
-               c->tags[i] = NULL;
-       c->tags[tsel] = tags[tsel];
-       pop(c);
-       focus(c);
+       for(; c && !c->tags[tsel]; c = c->prev);
+       return c;

 }
 
 void
 }
 
 void


@@ -174,18 +165,13 @@ void
 settags(Client *c)
 {
        char classinst[256];
 settags(Client *c)
 {
        char classinst[256];

-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+       static unsigned int len = sizeof(rule) / sizeof(rule[0]);

        unsigned int i, j;
        regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        unsigned int i, j;
        regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 

-       if(!len) {
-               c->tags[tsel] = tags[tsel];
-               return;
-       }
-

        if(XGetClassHint(dpy, c->win, &ch)) {
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",
        if(XGetClassHint(dpy, c->win, &ch)) {
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",


@@ -212,6 +198,13 @@ settags(Client *c)
                c->tags[tsel] = tags[tsel];
 }
 
                c->tags[tsel] = tags[tsel];
 }
 

+void
+togglemode(Arg *arg)
+{
+       arrange = arrange == dofloat ? dotile : dofloat;
+       arrange(NULL);
+}
+

 void
 view(Arg *arg)
 {
 void
 view(Arg *arg)
 {