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 4f2a69c..2f1e2b3 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,11 +11,17 @@
 /* static functions */
 
 static void
 /* static functions */
 
 static void

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

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

-       if(focus) {
+       if(focused) {

                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,


@@ -46,12 +52,10 @@ grabbuttons(Client *c, Bool focus)
        else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
        else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);

-

 }
 
 static void
 }
 
 static void

-resizetitle(Client *c)
-{
+resizetitle(Client *c) {

        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;


@@ -61,36 +65,30 @@ resizetitle(Client *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);
                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
 }
 
 static int

-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {

        return 0;
 }
 
 /* extern functions */
 
 void
        return 0;
 }
 
 /* extern functions */
 
 void

-ban(Client *c)
-{
+ban(Client *c) {

        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void

-focus(Client *c)
-{
+focus(Client *c) {

        Client *old;
 
        Client *old;
 

-       if(!issel)
+       if(!issel || (c && !isvisible(c)))

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

-               if(maximized)
-                       togglemax(NULL);

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


@@ -99,6 +97,9 @@ focus(Client *c)
                }
        }
        if(c) {
                }
        }
        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);


@@ -108,8 +109,7 @@ focus(Client *c)
 }
 
 Client *
 }
 
 Client *

-getclient(Window w)
-{
+getclient(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)


@@ -119,8 +119,7 @@ getclient(Window w)
 }
 
 Client *
 }
 
 Client *

-getctitle(Window w)
-{
+getctitle(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)


@@ -130,8 +129,7 @@ getctitle(Window w)
 }
 
 void
 }
 
 void

-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {

        int dx = 0, dy = 0;
 
        switch(c->grav) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {


@@ -185,8 +183,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
 }
 
 void

-killclient(Arg *arg)
-{
+killclient(Arg *arg) {

        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)
        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)


@@ -196,10 +193,8 @@ killclient(Arg *arg)
 }
 
 void
 }
 
 void

-manage(Window w, XWindowAttributes *wa)
-{
-       unsigned int i;
-       Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+       Client *c;

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


@@ -211,9 +206,13 @@ 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;
 
        c->border = 0;

-       setsize(c);
+       updatesize(c);

 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;


@@ -238,11 +237,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 &&


@@ -251,9 +246,10 @@ 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);
+       updatetitle(c);

        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);


@@ -263,8 +259,7 @@ manage(Window w, XWindowAttributes *wa)
 }
 
 void
 }
 
 void

-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {

        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;
        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;


@@ -288,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;


@@ -297,13 +302,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
                wc.border_width = 0;
        else
                wc.border_width = 1;

-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);

        XSync(dpy, False);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-setsize(Client *c)
-{
+updatesize(Client *c) {

        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 


@@ -341,8 +345,7 @@ setsize(Client *c)
 }
 
 void
 }
 
 void

-settitle(Client *c)
-{
+updatetitle(Client *c) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -369,57 +372,18 @@ settitle(Client *c)
 }
 
 void
 }
 
 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));
-}
+unmanage(Client *c) {
+       Client *nc;

 
 

-void
-unmanage(Client *c)
-{
-       Client *tc, *fc;
-       Window trans;
+       /* The server grab construct avoids race conditions. */

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);

+       detachstack(c);

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

-               XGetTransientForHint(dpy, c->win, &trans);
-               if(trans && (tc = getclient(trans)) && isvisible(tc))
-                       fc = tc;
-               else
-                       fc = getnext(clients);
-               focus(fc);
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);

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