fixing the settags issue, preparing 1.7.1

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 33b3c56..6b0322e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -54,19 +54,6 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
-static void
-resizetitle(Client *c) {
-       c->tw = textw(c->name);
-       if(c->tw > c->w)
-               c->tw = c->w + 2;
-       c->tx = c->x + c->w - c->tw + 2;
-       c->ty = c->y;
-       if(isvisible(c))
-               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
-       else
-               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-}
-
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
@@ -81,6 +68,23 @@ ban(Client *c) {
 }
 
 void
+configure(Client *c) {
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = c->x;
+       synev.xconfigure.y = c->y;
+       synev.xconfigure.width = c->w;
+       synev.xconfigure.height = c->h;
+       synev.xconfigure.border_width = c->border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+void
 focus(Client *c) {
        Client *old;
 
@@ -89,8 +93,6 @@ focus(Client *c) {
        if(!sel)
                sel = c;
        else if(sel != c) {
-               if(maximized)
-                       togglemax(NULL);
                old = sel;
                sel = c;
                if(old) {
@@ -235,11 +237,13 @@ manage(Window w, XWindowAttributes *wa) {
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        grabbuttons(c, False);
+       updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
+       resizetitle(c);
 
        if(clients)
                clients->prev = c;
@@ -247,7 +251,6 @@ manage(Window w, XWindowAttributes *wa) {
        c->snext = stack;
        stack = clients = c;
 
-       updatetitle(c);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
@@ -301,10 +304,24 @@ resize(Client *c, Bool sizehints, Corner sticky) {
        else
                wc.border_width = 1;
        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+       configure(c);
        XSync(dpy, False);
 }
 
 void
+resizetitle(Client *c) {
+       c->tw = textw(c->name);
+       if(c->tw > c->w)
+               c->tw = c->w + 2;
+       c->tx = c->x + c->w - c->tw + 2;
+       c->ty = c->y;
+       if(isvisible(c))
+               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
+       else
+               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
+}
+
+void
 updatesize(Client *c) {
        long msize;
        XSizeHints size;
@@ -366,48 +383,13 @@ updatetitle(Client *c) {
                }
        }
        XFree(name.value);
-       resizetitle(c);
-}
-
-void
-togglemax(Arg *arg) {
-       int ox, oy, ow, oh;
-       Client *c;
-       XEvent ev;
-
-       if(!sel)
-               return;
-
-       if((maximized = !maximized)) {
-               ox = sel->x;
-               oy = sel->y;
-               ow = sel->w;
-               oh = sel->h;
-               sel->x = sx;
-               sel->y = sy + bh;
-               sel->w = sw - 2;
-               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;
-               sel->y = oy;
-               sel->w = ow;
-               sel->h = oh;
-       }
-       else
-               arrange(NULL);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 unmanage(Client *c) {
        Client *nc;
 
+       /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);