firefox instance is different now

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 0861128..077c93c 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -2,71 +2,38 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "dwm.h"
+/* static */
 
+/* CUSTOMIZE */ 
 static Rule rule[] = {
-       /* class                        instance        tags                                            dofloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
+       /* class                        instance        tags                                            isfloat */
+       { "Firefox-bin",        "firefox-bin",  { [Twww] = "www" },                     False },
 };
 
-void (*arrange)(Arg *) = dotile;
+/* extern */
 
-Client *
-getnext(Client *c)
-{
-       for(; c && !c->tags[tsel]; c = c->next);
-       return c;
-}
+/* CUSTOMIZE */
+char *tags[TLast] = {
+       [Tscratch] = "scratch",
+       [Tdev] = "dev",
+       [Twww] = "www",
+       [Twork] = "work",
+};
+void (*arrange)(Arg *) = dotile;
 
 void
-settags(Client *c)
+appendtag(Arg *arg)
 {
-       XClassHint ch;
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
-       Bool matched = False;
-
-       if(!len) {
-               c->tags[tsel] = tags[tsel];
+       if(!sel)
                return;
-       }
-
-       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++)
-                                               c->tags[j] = rule[i].tags[j];
-                                       c->dofloat = rule[i].dofloat;
-                                       matched = True;
-                                       break;
-                               }
-               }
-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
-       }
 
-       if(!matched)
-               c->tags[tsel] = tags[tsel];
-}
-
-void
-view(Arg *arg)
-{
-       tsel = arg->i;
+       sel->tags[arg->i] = tags[arg->i];
        arrange(NULL);
-       drawall();
 }
 
 void
@@ -76,13 +43,15 @@ dofloat(Arg *arg)
 
        arrange = dofloat;
        for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
+               setgeom(c);
+               if(c->tags[tsel]) {
                        resize(c, True);
+               }
                else
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -99,7 +68,7 @@ dotile(Arg *arg)
        w = sw - mw;
        arrange = dotile;
        for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->dofloat)
+               if(c->tags[tsel] && !c->isfloat)
                        n++;
 
        if(n > 1)
@@ -108,29 +77,30 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
+               setgeom(c);
                if(c->tags[tsel]) {
-                       if(c->dofloat) {
+                       if(c->isfloat) {
                                higher(c);
                                resize(c, True);
                                continue;
                        }
                        if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               *c->x = sx;
+                               *c->y = sy + bh;
+                               *c->w = sw - 2 * c->border;
+                               *c->h = sh - 2 * c->border - bh;
                        }
                        else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               *c->x = sx;
+                               *c->y = sy + bh;
+                               *c->w = mw - 2 * c->border;
+                               *c->h = sh - 2 * c->border - bh;
                        }
                        else {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+                               *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);
                        i++;
@@ -139,7 +109,7 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -147,14 +117,30 @@ dotile(Arg *arg)
        drawall();
 }
 
+Client *
+getnext(Client *c, unsigned int t)
+{
+       for(; c && !c->tags[t]; c = c->next);
+       return c;
+}
+
 void
-appendtag(Arg *arg)
+heretag(Arg *arg)
 {
-       if(!sel)
+       int i;
+       Client *c;
+
+       if(arg->i == tsel)
                return;
 
-       sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
+       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);
 }
 
 void
@@ -169,3 +155,46 @@ replacetag(Arg *arg)
        appendtag(arg);
 }
 
+void
+settags(Client *c)
+{
+       XClassHint ch;
+       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+       unsigned int i, j;
+       Bool matched = False;
+
+       if(!len) {
+               c->tags[tsel] = tags[tsel];
+               return;
+       }
+
+       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++)
+                                               c->tags[j] = rule[i].tags[j];
+                                       c->isfloat = rule[i].isfloat;
+                                       matched = True;
+                                       break;
+                               }
+               }
+               if(ch.res_class)
+                       XFree(ch.res_class);
+               if(ch.res_name)
+                       XFree(ch.res_name);
+       }
+
+       if(!matched)
+               c->tags[tsel] = tags[tsel];
+}
+
+void
+view(Arg *arg)
+{
+       tsel = arg->i;
+       arrange(NULL);
+       drawall();
+}