implemented the maximization as I described on the mailinglist, this feels better...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index dce06e9..2f1e2b3 100644 (file)
--- a/client.c
+++ b/client.c
@@ -89,8 +89,6 @@ focus(Client *c) {
        if(!sel)
                sel = c;
        else if(sel != c) {
        if(!sel)
                sel = c;
        else if(sel != c) {

-               if(maximized)
-                       togglemax(NULL);

                old = sel;
                sel = c;
                if(old) {
                old = sel;
                sel = c;
                if(old) {


@@ -208,6 +206,10 @@ manage(Window w, XWindowAttributes *wa) {
        c->w = c->tw = wa->width;
        c->h = wa->height;
        c->th = bh;
        c->w = c->tw = wa->width;
        c->h = wa->height;
        c->th = bh;

+       c->rx = sx;
+       c->ry = bh;
+       c->rw = sw;
+       c->rh = sh - bh;

 
        c->border = 0;
        updatesize(c);
 
        c->border = 0;
        updatesize(c);


@@ -281,6 +283,16 @@ resize(Client *c, Bool sizehints, Corner sticky) {
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 

+       /* offscreen appearance fixes */
+       if(c->x + c->w < 0)
+               c->x = 0;
+       if(c->y + c->h < bh)
+               c->y = bh;
+       if(c->x > sw)
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->y = sh - c->h;
+

        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;
        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;


@@ -359,45 +371,11 @@ updatetitle(Client *c) {
        resizetitle(c);
 }
 
        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;
 
 void
 unmanage(Client *c) {
        Client *nc;
 

+       /* The server grab construct avoids race conditions. */

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