regarding to http://plan9.bell-labs.com/sources/contrib/rsc/man.ps the BUGS section...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index f2cd802..e11abfd 100644 (file)
--- a/client.c
+++ b/client.c
@@ -93,9 +93,9 @@ focus(Client *c) {
        }
        sel = c;
        drawstatus();
        }
        sel = c;
        drawstatus();

-       if(!activescreen)
+       if(!selscreen)

                return;
                return;

-       if(sel) {
+       if(c) {

                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }


@@ -142,14 +142,14 @@ manage(Window w, XWindowAttributes *wa) {
        }
        else {
                c->border = BORDERPX;
        }
        else {
                c->border = BORDERPX;

-               if(c->x < wax)
-                       c->x = wax;
-               if(c->y < way)
-                       c->y = way;

                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)
                        c->y = way + wah - c->h - 2 * c->border;
                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)
                        c->y = way + wah - c->h - 2 * c->border;

+               if(c->x < wax)
+                       c->x = wax;
+               if(c->y < way)
+                       c->y = way;

        }
        updatesizehints(c);
        c->proto = getproto(c->win);
        }
        updatesizehints(c);
        c->proto = getproto(c->win);


@@ -157,6 +157,7 @@ manage(Window w, XWindowAttributes *wa) {
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        grabbuttons(c, False);
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        grabbuttons(c, False);

+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

        updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)
        updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)


@@ -177,6 +178,8 @@ void
 resize(Client *c, Bool sizehints) {
        XWindowChanges wc;
 
 resize(Client *c, Bool sizehints) {
        XWindowChanges wc;
 

+       if(c->w <= 0 || c->h <= 0)
+               return;

        if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
        if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;


@@ -196,14 +199,14 @@ resize(Client *c, Bool sizehints) {
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */

-       if(c->x + c->w + 2 * c->border < sx)
-               c->x = sx;
-       if(c->y + c->h + 2 * c->border < sy)
-               c->y = sy;

        if(c->x > sw)
                c->x = sw - c->w - 2 * c->border;
        if(c->y > sh)
                c->y = sh - c->h - 2 * c->border;
        if(c->x > sw)
                c->x = sw - c->w - 2 * c->border;
        if(c->y > sh)
                c->y = sh - c->h - 2 * c->border;

+       if(c->x + c->w + 2 * c->border < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * c->border < sy)
+               c->y = sy;

        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;