applied anydot's 3 minor patches, thank you anydot

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 0251445..90399ae 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,6 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */

 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>


@@ -18,6 +18,7 @@ attachstack(Client *c) {
 static void
 detachstack(Client *c) {
        Client **tc;
 static void
 detachstack(Client *c) {
        Client **tc;

+

        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }


@@ -77,28 +78,11 @@ isprotodel(Client *c) {
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};

+

        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

-static void
-togglemax(Client *c) {
-       XEvent ev;
-
-       if(c->isfixed)
-               return;
-       if((c->ismax = !c->ismax)) {
-               c->rx = c->x;
-               c->ry = c->y;
-               c->rw = c->w;
-               c->rh = c->h;
-               resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
-       }
-       else
-               resize(c, c->rx, c->ry, c->rw, c->rh, True);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-

 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;


@@ -145,8 +129,8 @@ detach(Client *c) {
 
 void
 focus(Client *c) {
 
 void
 focus(Client *c) {

-       if(c && !isvisible(c))
-               return;
+       if( !c && selscreen || c && !isvisible(c))
+               for(c = stack; c && !isvisible(c); c = c->snext);

        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);


@@ -169,51 +153,29 @@ focus(Client *c) {
 }
 
 void
 }
 
 void

-focusnext(Arg *arg) {
-       Client *c;
-   
-       if(!sel)
-               return;
-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-focusprev(Arg *arg) {
-       Client *c;
+killclient(const char *arg) {
+       XEvent ev;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
+       if(isprotodel(sel)) {
+               ev.type = ClientMessage;
+               ev.xclient.window = sel->win;
+               ev.xclient.message_type = wmatom[WMProtocols];
+               ev.xclient.format = 32;
+               ev.xclient.data.l[0] = wmatom[WMDelete];
+               ev.xclient.data.l[1] = CurrentTime;
+               XSendEvent(dpy, sel->win, False, NoEventMask, &ev);

        }
        }

-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-killclient(Arg *arg) {
-       if(!sel)
-               return;
-       if(isprotodel(sel))
-               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);

        else
                XKillClient(dpy, sel->win);
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
        else
                XKillClient(dpy, sel->win);
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {

-       Client *c, *t;
+       Client *c, *t = NULL;

        Window trans;
        Window trans;

+       Status rettrans;

        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));


@@ -223,13 +185,13 @@ manage(Window w, XWindowAttributes *wa) {
        c->y = wa->y;
        c->w = wa->width;
        c->h = wa->height;
        c->y = wa->y;
        c->w = wa->width;
        c->h = wa->height;

+       c->oldborder = wa->border_width;

        if(c->w == sw && c->h == sh) {
        if(c->w == sw && c->h == sh) {

-               c->border = 0;

                c->x = sx;
                c->y = sy;
                c->x = sx;
                c->y = sy;

+               c->border = wa->border_width;

        }
        else {
        }
        else {

-               c->border = BORDERPX;

                if(c->x + c->w + 2 * c->border > wax + waw)
                        c->x = wax + waw - c->w - 2 * c->border;
                if(c->y + c->h + 2 * c->border > way + wah)
                if(c->x + c->w + 2 * c->border > wax + waw)
                        c->x = wax + waw - c->w - 2 * c->border;
                if(c->y + c->h + 2 * c->border > way + wah)


@@ -238,69 +200,54 @@ manage(Window w, XWindowAttributes *wa) {
                        c->x = wax;
                if(c->y < way)
                        c->y = way;
                        c->x = wax;
                if(c->y < way)
                        c->y = way;

+               c->border = BORDERPX;

        }
        }

+       wc.border_width = c->border;
+       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+       configure(c); /* propagates border_width, if size doesn't change */

        updatesizehints(c);
        updatesizehints(c);

-       XSelectInput(dpy, c->win,
+       XSelectInput(dpy, w,

                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);

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

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

-       wc.border_width = c->border;
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
-       configure(c); /* propagates border_width, if size doesn't change */

        updatetitle(c);
        updatetitle(c);

-       for(t = clients; t && t->win != c->win; t = t->next);
+       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
+               for(t = clients; t && t->win != trans; t = t->next);

        settags(c, t);
        settags(c, t);

-       if(!c->isfloat)
-               c->isfloat = (t != 0) || c->isfixed;
+       if(!c->isfloating)
+               c->isfloating = (rettrans == Success) || c->isfixed;

        attach(c);
        attachstack(c);
        c->isbanned = True;
        attach(c);
        attachstack(c);
        c->isbanned = True;

-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMapWindow(dpy, c->win);
+       XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+       XMapWindow(dpy, w);

        setclientstate(c, NormalState);
        setclientstate(c, NormalState);

-       if(isvisible(c))
-               focus(c);
-       arrange();
-}
-
-Client *
-nexttiled(Client *c) {
-       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
-       return c;
+       focus(c);
+       lt->arrange();

 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {

-       float actual, dx, dy, max, min;
+       float dx, dy, max, min, ratio;

        XWindowChanges wc;
 
        if(w <= 0 || h <= 0)
                return;
        if(sizehints) {
        XWindowChanges wc;
 
        if(w <= 0 || h <= 0)
                return;
        if(sizehints) {

-               if(c->minw && w < c->minw)
-                       w = c->minw;
-               if(c->minh && h < c->minh)
-                       h = c->minh;
-               if(c->maxw && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh && h > c->maxh)
-                       h = c->maxh;
-               /* inspired by algorithm from fluxbox */
-               if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) {
+               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {

                        dx = (float)(w - c->basew);
                        dy = (float)(h - c->baseh);
                        min = (float)(c->minax) / (float)(c->minay);
                        max = (float)(c->maxax) / (float)(c->maxay);
                        dx = (float)(w - c->basew);
                        dy = (float)(h - c->baseh);
                        min = (float)(c->minax) / (float)(c->minay);
                        max = (float)(c->maxax) / (float)(c->maxay);

-                       actual = dx / dy;
-                       if(max > 0 && min > 0 && actual > 0) {
-                               if(actual < min) {
+                       ratio = dx / dy;
+                       if(max > 0 && min > 0 && ratio > 0) {
+                               if(ratio < min) {

                                        dy = (dx * min + dy) / (min * min + 1);
                                        dx = dy * min;
                                        w = (int)dx + c->basew;
                                        h = (int)dy + c->baseh;
                                }
                                        dy = (dx * min + dy) / (min * min + 1);
                                        dx = dy * min;
                                        w = (int)dx + c->basew;
                                        h = (int)dy + c->baseh;
                                }

-                               else if(actual > max) {
+                               else if(ratio > max) {

                                        dy = (dx * min + dy) / (max * max + 1);
                                        dx = dy * min;
                                        w = (int)dx + c->basew;
                                        dy = (dx * min + dy) / (max * max + 1);
                                        dx = dy * min;
                                        w = (int)dx + c->basew;


@@ -308,15 +255,21 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                                }
                        }
                }
                                }
                        }
                }

+               if(c->minw && w < c->minw)
+                       w = c->minw;
+               if(c->minh && h < c->minh)
+                       h = c->minh;
+               if(c->maxw && w > c->maxw)
+                       w = c->maxw;
+               if(c->maxh && h > c->maxh)
+                       h = c->maxh;

                if(c->incw)
                        w -= (w - c->basew) % c->incw;
                if(c->inch)
                        h -= (h - c->baseh) % c->inch;
        }
                if(c->incw)
                        w -= (w - c->basew) % c->incw;
                if(c->inch)
                        h -= (h - c->baseh) % c->inch;
        }

-       if(w == sw && h == sh)
-               c->border = 0;
-       else
-               c->border = BORDERPX;
+       if(w <= 0 || h <= 0)
+               return;

        /* offscreen appearance fixes */
        if(x > sw)
                x = sw - w - 2 * c->border;
        /* offscreen appearance fixes */
        if(x > sw)
                x = sw - w - 2 * c->border;


@@ -338,6 +291,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
 }
 
        }
 }
 

+void
+togglefloating(const char *arg) {
+       if(!sel || lt->arrange == floating)
+               return;
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating)
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+       lt->arrange();
+}
+

 void
 updatesizehints(Client *c) {
        long msize;
 void
 updatesizehints(Client *c) {
        long msize;


@@ -350,6 +313,10 @@ updatesizehints(Client *c) {
                c->basew = size.base_width;
                c->baseh = size.base_height;
        }
                c->basew = size.base_width;
                c->baseh = size.base_height;
        }

+       else if(c->flags & PMinSize) {
+               c->basew = size.min_width;
+               c->baseh = size.min_height;
+       }

        else
                c->basew = c->baseh = 0;
        if(c->flags & PResizeInc) {
        else
                c->basew = c->baseh = 0;
        if(c->flags & PResizeInc) {


@@ -368,16 +335,20 @@ updatesizehints(Client *c) {
                c->minw = size.min_width;
                c->minh = size.min_height;
        }
                c->minw = size.min_width;
                c->minh = size.min_height;
        }

+       else if(c->flags & PBaseSize) {
+               c->minw = size.base_width;
+               c->minh = size.base_height;
+       }

        else
                c->minw = c->minh = 0;
        if(c->flags & PAspect) {
                c->minax = size.min_aspect.x;
        else
                c->minw = c->minh = 0;
        if(c->flags & PAspect) {
                c->minax = size.min_aspect.x;

-               c->minay = size.min_aspect.y;

                c->maxax = size.max_aspect.x;
                c->maxax = size.max_aspect.x;

+               c->minay = size.min_aspect.y;

                c->maxay = size.max_aspect.y;
        }
        else
                c->maxay = size.max_aspect.y;
        }
        else

-               c->minax = c->minay = c->maxax = c->maxay = 0;
+               c->minax = c->maxax = c->minay = c->maxay = 0;

        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
                        && c->maxw == c->minw && c->maxh == c->minh);
 }
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
                        && c->maxw == c->minw && c->maxh == c->minh);
 }


@@ -396,31 +367,32 @@ updatetitle(Client *c) {
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)

-               strncpy(c->name, (char *)name.value, sizeof c->name);
+               strncpy(c->name, (char *)name.value, sizeof c->name - 1);

        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                && n > 0 && *list)
                {
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                && n > 0 && *list)
                {

-                       strncpy(c->name, *list, sizeof c->name);
+                       strncpy(c->name, *list, sizeof c->name - 1);

                        XFreeStringList(list);
                }
        }
                        XFreeStringList(list);
                }
        }

+       c->name[sizeof c->name - 1] = '\0';

        XFree(name.value);
 }
 
 void
 unmanage(Client *c) {
        XFree(name.value);
 }
 
 void
 unmanage(Client *c) {

-       Client *nc;
+       XWindowChanges wc;

 
 

+       wc.border_width = c->oldborder;

        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);

+       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */

        detach(c);
        detachstack(c);
        detach(c);
        detachstack(c);

-       if(sel == c) {
-               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
-               focus(nc);
-       }
+       if(sel == c)
+               focus(NULL);

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
        free(c->tags);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
        free(c->tags);


@@ -428,28 +400,5 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       arrange();
-}
-
-void
-zoom(Arg *arg) {
-       unsigned int n;
-       Client *c;
-
-       if(!sel)
-               return;
-       if(sel->isfloat || (arrange == dofloat)) {
-               togglemax(sel);
-               return;
-       }
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
-                       return;
-       detach(c);
-       attach(c);
-       focus(c);
-       arrange();
+       lt->arrange();

 }
 }