applied sanders patch of not manipulating sel

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9645444..6524c06 100644 (file)
--- a/client.c
+++ b/client.c
@@ -10,6 +10,14 @@
 
 /* static functions */
 
 
 /* static functions */
 

+static void
+detachstack(Client *c)
+{
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+

 static void
 grabbuttons(Client *c, Bool focus)
 {
 static void
 grabbuttons(Client *c, Bool focus)
 {


@@ -82,22 +90,32 @@ ban(Client *c)
 void
 focus(Client *c)
 {
 void
 focus(Client *c)
 {

-       Client *old = sel;
+       Client *old;

 
        if(!issel)
                return;
        if(!sel)
                sel = c;
        else if(sel != c) {
 
        if(!issel)
                return;
        if(!sel)
                sel = c;
        else if(sel != c) {

-               if(sel->ismax)
+               if(maximized)

                        togglemax(NULL);
                        togglemax(NULL);

+               old = sel;

                sel = c;
                sel = c;

-               grabbuttons(old, False);
-               drawtitle(old);
+               if(old) {
+                       grabbuttons(old, False);
+                       drawtitle(old);
+               }
+       }
+       if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);
+               drawtitle(c);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

        }
        }

-       grabbuttons(c, True);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 Client *
 }
 
 Client *


@@ -191,8 +209,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       unsigned int i;
-       Client *c, *tc;
+       Client *c;

        Window trans;
        XSetWindowAttributes twa;
 
        Window trans;
        XSetWindowAttributes twa;
 


@@ -231,11 +248,7 @@ manage(Window w, XWindowAttributes *wa)
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        grabbuttons(c, False);
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        grabbuttons(c, False);

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

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


@@ -244,16 +257,16 @@ manage(Window w, XWindowAttributes *wa)
        if(clients)
                clients->prev = c;
        c->next = clients;
        if(clients)
                clients->prev = c;
        c->next = clients;

-       clients = c;
+       c->snext = stack;
+       stack = clients = c;

 
        settitle(c);
 
        settitle(c);

-       if(isvisible(c))
-               sel = c;
-       arrange(NULL);
+       ban(c);

        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);

+       arrange(NULL);

 }
 
 void
 }
 
 void


@@ -366,12 +379,13 @@ void
 togglemax(Arg *arg)
 {
        int ox, oy, ow, oh;
 togglemax(Arg *arg)
 {
        int ox, oy, ow, oh;

+       Client *c;

        XEvent ev;
 
        if(!sel)
                return;
 
        XEvent ev;
 
        if(!sel)
                return;
 

-       if((sel->ismax = !sel->ismax)) {
+       if((maximized = !maximized)) {

                ox = sel->x;
                oy = sel->y;
                ow = sel->w;
                ox = sel->x;
                oy = sel->y;
                ow = sel->w;


@@ -382,6 +396,9 @@ togglemax(Arg *arg)
                sel->h = sh - 2 - bh;
 
                restack();
                sel->h = sh - 2 - bh;
 
                restack();

+               for(c = getnext(clients); c; c = getnext(c->next))
+                       if(c != sel)
+                               ban(c);

                resize(sel, arrange == dofloat, TopLeft);
 
                sel->x = ox;
                resize(sel, arrange == dofloat, TopLeft);
 
                sel->x = ox;


@@ -390,37 +407,33 @@ togglemax(Arg *arg)
                sel->h = oh;
        }
        else
                sel->h = oh;
        }
        else

-               resize(sel, False, TopLeft);
+               arrange(NULL);

        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 unmanage(Client *c)
 {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 unmanage(Client *c)
 {

-       Client *tc;
-       Window trans;
+       Client *nc;
+

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 

-       XGetTransientForHint(dpy, c->win, &trans);
+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }

 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 

-       detach(c);
-       if(sel == c) {
-               if(trans && (tc = getclient(trans)) && isvisible(tc))
-                       sel = tc;
-               else
-                       sel = getnext(clients);
-       }

        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       if(sel)
-               focus(sel);

        arrange(NULL);
 }
        arrange(NULL);
 }