changed -v output (now also anydot and nsz are contained in this output)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b7fde1a..c4b0941 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,5 +1,7 @@
 /* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
  * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 /* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
  * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>

+ * © 2007 Premysl Hruby <dfenze at gmail dot com>
+ * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>

  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>


@@ -129,8 +131,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]);


@@ -185,13 +187,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)


@@ -200,15 +202,16 @@ 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;

        }
        }

-       updatesizehints(c);
-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       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 */
        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);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);


@@ -221,8 +224,7 @@ manage(Window w, XWindowAttributes *wa) {
        XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
        XMapWindow(dpy, w);
        setclientstate(c, NormalState);
        XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
        XMapWindow(dpy, w);
        setclientstate(c, NormalState);

-       if(isvisible(c))
-               focus(c);
+       focus(c);

        lt->arrange();
 }
 
        lt->arrange();
 }
 


@@ -270,10 +272,6 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
        if(w <= 0 || h <= 0)
                return;
        }
        if(w <= 0 || h <= 0)
                return;

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

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


@@ -300,6 +298,8 @@ togglefloating(const char *arg) {
        if(!sel || lt->arrange == floating)
                return;
        sel->isfloating = !sel->isfloating;
        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();
 }
 
        lt->arrange();
 }
 


@@ -369,31 +369,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);