small changes to dwm.1, rearranged order within main event loop

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 9904dd1..cdb0f52 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -35,16 +35,6 @@ void (*arrange)(Arg *) = DEFMODE;
 /* extern */
 
 void
-appendtag(Arg *arg)
-{
-       if(!sel)
-               return;
-
-       sel->tags[arg->i] = True;
-       arrange(NULL);
-}
-
-void
 dofloat(Arg *arg)
 {
        Client *c;
@@ -57,19 +47,19 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if((sel = getnext(clients))) {
-               higher(sel);
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)
                focus(sel);
-       }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-       drawall();
+       restack();
 }
 
 void
 dotile(Arg *arg)
 {
-       int n, i, w, h;
+       int h, i, n, w;
        Client *c;
 
        w = sw - mw;
@@ -86,7 +76,6 @@ dotile(Arg *arg)
                c->ismax = False;
                if(isvisible(c)) {
                        if(c->isfloat) {
-                               higher(c);
                                resize(c, True, TopLeft);
                                continue;
                        }
@@ -123,13 +112,13 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if((sel = getnext(clients))) {
-               higher(sel);
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)
                focus(sel);
-       }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-       drawall();
+       restack();
 }
 
 Client *
@@ -187,16 +176,55 @@ isvisible(Client *c)
 }
 
 void
-replacetag(Arg *arg)
+restack()
 {
-       int i;
+       static unsigned int nwins = 0;
+       static Window *wins = NULL;
+       unsigned int f, fi, m, mi, n;
+       Client *c;
+       XEvent ev;
 
-       if(!sel)
+       for(f = 0, m = 0, c = clients; c; c = c->next)
+               if(isvisible(c)) {
+                       if(c->isfloat || arrange == dofloat)
+                               f++;
+                       else
+                               m++;
+               }
+       if(!(n = 2 * (f + m))) {
+               drawstatus();
                return;
+       }
+       if(nwins < n) {
+               nwins = n;
+               wins = erealloc(wins, nwins * sizeof(Window));
+       }
 
-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = False;
-       appendtag(arg);
+       fi = 0;
+       mi = 2 * f;
+       if(sel->isfloat || arrange == dofloat) {
+               wins[fi++] = sel->title;
+               wins[fi++] = sel->win;
+       }
+       else {
+               wins[mi++] = sel->title;
+               wins[mi++] = sel->win;
+       }
+       for(c = clients; c; c = c->next)
+               if(isvisible(c) && c != sel) {
+                       if(c->isfloat || arrange == dofloat) {
+                               wins[fi++] = c->title;
+                               wins[fi++] = c->win;
+                       }
+                       else {
+                               wins[mi++] = c->title;
+                               wins[mi++] = c->win;
+                       }
+               }
+       XRestackWindows(dpy, wins, n);
+       drawall();
+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
@@ -233,53 +261,68 @@ settags(Client *c)
 }
 
 void
+tag(Arg *arg)
+{
+       unsigned int i;
+
+       if(!sel)
+               return;
+
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = False;
+       sel->tags[arg->i] = True;
+       settitle(sel);
+       if(!isvisible(sel))
+               arrange(NULL);
+}
+
+void
 togglemode(Arg *arg)
 {
        arrange = arrange == dofloat ? dotile : dofloat;
-       arrange(NULL);
+       if(sel)
+               arrange(NULL);
+       else
+               drawstatus();
 }
 
 void
-view(Arg *arg)
+toggletag(Arg *arg)
 {
        unsigned int i;
 
-       for(i = 0; i < ntags; i++)
-               seltag[i] = False;
-       seltag[arg->i] = True;
-       arrange(NULL);
-       drawall();
+       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;
+       settitle(sel);
+       if(!isvisible(sel))
+               arrange(NULL);
 }
 
+
 void
 toggleview(Arg *arg)
 {
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
-       for(i = 0; !seltag[i] && i < ntags; i++);
+       for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        arrange(NULL);
-       drawall();
-}
-
-void
-viewnext(Arg *arg)
-{
-       unsigned int i;
-
-       for(i = 0; !seltag[i]; i++);
-       arg->i = (i < ntags-1) ? i+1 : 0;
-       view(arg);
 }
 
 void
-viewprev(Arg *arg)
+view(Arg *arg)
 {
        unsigned int i;
 
-       for(i = 0; !seltag[i]; i++);
-       arg->i = (i > 0) ? i-1 : ntags-1;
-       view(arg);
+       for(i = 0; i < ntags; i++)
+               seltag[i] = False;
+       seltag[arg->i] = True;
+       arrange(NULL);
 }