separated layout-specific stuff into separate .h and .c files which are included...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 1844713..d4dfe6e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,6 +1,4 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
@@ -99,6 +97,16 @@ attach(Client *c) {
 }
 
 void
+ban(Client *c) {
+       if(c->isbanned)
+               return;
+       XUnmapWindow(dpy, c->win);
+       setclientstate(c, IconicState);
+       c->isbanned = True;
+       c->unmapped++;
+}
+
+void
 configure(Client *c) {
        XConfigureEvent ce;
 
@@ -129,8 +137,8 @@ detach(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]);
@@ -173,8 +181,9 @@ killclient(const char *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
-       Client *c, *t;
+       Client *c, *t = NULL;
        Window trans;
+       Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
@@ -184,13 +193,13 @@ manage(Window w, XWindowAttributes *wa) {
        c->y = wa->y;
        c->w = wa->width;
        c->h = wa->height;
+       c->oldborder = wa->border_width;
        if(c->w == sw && c->h == sh) {
-               c->border = 0;
                c->x = sx;
                c->y = sy;
+               c->border = wa->border_width;
        }
        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)
@@ -199,29 +208,28 @@ manage(Window w, XWindowAttributes *wa) {
                        c->x = wax;
                if(c->y < way)
                        c->y = way;
+               c->border = BORDERPX;
        }
-       updatesizehints(c);
-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, w, &trans);
-       grabbuttons(c, False);
        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);
+       XSelectInput(dpy, w,
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       grabbuttons(c, False);
        updatetitle(c);
-       for(t = clients; t && t->win != trans; t = t->next);
+       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
+               for(t = clients; t && t->win != trans; t = t->next);
        settags(c, t);
        if(!c->isfloating)
-               c->isfloating = (t != NULL) || c->isfixed;
+               c->isfloating = (rettrans == Success) || c->isfixed;
        attach(c);
        attachstack(c);
+       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+       setclientstate(c, IconicState);
        c->isbanned = True;
-       XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
-       XMapWindow(dpy, w);
-       setclientstate(c, NormalState);
-       if(isvisible(c))
-               focus(c);
+       focus(c);
        lt->arrange();
 }
 
@@ -233,7 +241,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        if(w <= 0 || h <= 0)
                return;
        if(sizehints) {
-               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);
@@ -267,10 +275,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                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;
@@ -297,6 +303,40 @@ 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
+unban(Client *c) {
+       if(!c->isbanned)
+               return;
+       XMapWindow(dpy, c->win);
+       setclientstate(c, NormalState);
+       c->isbanned = False;
+}
+
+void
+unmanage(Client *c) {
+       XWindowChanges wc;
+
+       wc.border_width = c->oldborder;
+       /* The server grab construct avoids race conditions. */
+       XGrabServer(dpy);
+       XSetErrorHandler(xerrordummy);
+       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+       detach(c);
+       detachstack(c);
+       if(sel == c)
+               focus(NULL);
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       setclientstate(c, WithdrawnState);
+       free(c->tags);
+       free(c);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
+       XUngrabServer(dpy);
        lt->arrange();
 }
 
@@ -366,37 +406,15 @@ updatetitle(Client *c) {
        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)
                {
-                       strncpy(c->name, *list, sizeof c->name);
+                       strncpy(c->name, *list, sizeof c->name - 1);
                        XFreeStringList(list);
                }
        }
+       c->name[sizeof c->name - 1] = '\0';
        XFree(name.value);
 }
-
-void
-unmanage(Client *c) {
-       Client *nc;
-
-       /* The server grab construct avoids race conditions. */
-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
-       detach(c);
-       detachstack(c);
-       if(sel == c) {
-               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
-               focus(nc);
-       }
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
-       free(c->tags);
-       free(c);
-       XSync(dpy, False);
-       XSetErrorHandler(xerror);
-       XUngrabServer(dpy);
-       lt->arrange();
-}