fixed default key bindings (indexes of tags were screwed up)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 8b98c19..af0190f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -89,40 +89,6 @@ focus(Client *c)
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 

-void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
-               return;
-
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-focusprev(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
-               return;
-
-       if(!(c = getprev(sel->prev))) {
-               for(c = clients; c && c->next; c = c->next);
-               c = getprev(c);
-       }
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-

 Client *
 getclient(Window w)
 {
 Client *
 getclient(Window w)
 {


@@ -214,6 +180,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

+       unsigned int i;

        Client *c, *tc;
        Window trans;
        XSetWindowAttributes twa;
        Client *c, *tc;
        Window trans;
        XSetWindowAttributes twa;


@@ -261,7 +228,11 @@ manage(Window w, XWindowAttributes *wa)
        grabbutton(c, Button2, MODKEY);
        grabbutton(c, Button3, MODKEY);
 
        grabbutton(c, Button2, MODKEY);
        grabbutton(c, Button3, MODKEY);
 

-       settags(c);
+       if((tc = getclient(trans))) /* inherit tags */
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = tc->tags[i];
+       else
+               settags(c);

        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&


@@ -441,30 +412,3 @@ unmanage(Client *c)
                focus(sel);
        arrange(NULL);
 }
                focus(sel);
        arrange(NULL);
 }

-
-void
-zoom(Arg *arg)
-{
-       Client *c;
-
-       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
-               return;
-
-       if(sel == getnext(clients))  {
-               if((c = getnext(sel->next)))
-                       sel = c;
-               else
-                       return;
-       }
-
-       /* pop */
-       sel->prev->next = sel->next;
-       if(sel->next)
-               sel->next->prev = sel->prev;
-       sel->prev = NULL;
-       clients->prev = sel;
-       sel->next = clients;
-       clients = sel;
-       focus(sel);
-       arrange(NULL);
-}