fixed the border issue for mplayer, ff is definately broken when using F11 (fullscree...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index e599203..03d158f 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>


@@ -173,8 +173,9 @@ killclient(const char *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 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));


@@ -184,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)


@@ -199,21 +200,22 @@ 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);
-       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 */
        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);
        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)
        settags(c, t);
        if(!c->isfloating)

-               c->isfloating = (t != NULL) || c->isfixed;
+               c->isfloating = (rettrans == Success) || c->isfixed;

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


@@ -227,35 +229,26 @@ manage(Window w, XWindowAttributes *wa) {
 
 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;


@@ -263,15 +256,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;


@@ -313,6 +312,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) {


@@ -331,16 +334,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);
 }


@@ -374,10 +381,13 @@ updatetitle(Client *c) {
 void
 unmanage(Client *c) {
        Client *nc;
 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);
        if(sel == c) {
        detach(c);
        detachstack(c);
        if(sel == c) {