reducing focus calls (sanders patch)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9c0428a..8a8a99e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -82,22 +82,29 @@ 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) {
+               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 *


@@ -230,13 +237,7 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 

-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-

        grabbuttons(c, False);
        grabbuttons(c, False);

-

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


@@ -246,9 +247,13 @@ manage(Window w, XWindowAttributes *wa)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);

+
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+

        settitle(c);
        settitle(c);

-       if(isvisible(c))
-               sel = c;

        arrange(NULL);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        arrange(NULL);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);


@@ -366,12 +371,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 +388,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,42 +399,36 @@ 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;
+       Client *tc, *fc;

        Window trans;
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        Window trans;
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 

-       XGetTransientForHint(dpy, c->win, &trans);
-
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XDestroyWindow(dpy, c->twin);
-
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
+       detach(c);

        if(sel == c) {
        if(sel == c) {

+               XGetTransientForHint(dpy, c->win, &trans);

                if(trans && (tc = getclient(trans)) && isvisible(tc))
                if(trans && (tc = getclient(trans)) && isvisible(tc))

-                       sel = tc;
+                       fc = tc;

                else
                else

-                       sel = getnext(clients);
+                       fc = getnext(clients);
+               focus(fc);

        }
        }

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

        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);
 }