yet another fix of copyright compactisition

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 4ba15c4..b7fde1a 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>
@@ -154,18 +154,28 @@ focus(Client *c) {
 
 void
 killclient(const char *arg) {
+       XEvent ev;
+
        if(!sel)
                return;
-       if(isprotodel(sel))
-               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       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);
+       }
        else
                XKillClient(dpy, sel->win);
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
-       Client *c, *t;
+       Client *c, *t = NULL;
        Window trans;
+       Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
@@ -194,17 +204,17 @@ manage(Window w, XWindowAttributes *wa) {
        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 */
        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->isuntiled)
-               c->isuntiled = (t != NULL) || c->isfixed;
+       if(!c->isfloating)
+               c->isfloating = (rettrans == Success) || c->isfixed;
        attach(c);
        attachstack(c);
        c->isbanned = True;
@@ -218,35 +228,26 @@ manage(Window w, XWindowAttributes *wa) {
 
 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) {
-               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);
-                       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;
                                }
-                               else if(actual > max) {
+                               else if(ratio > max) {
                                        dy = (dx * min + dy) / (max * max + 1);
                                        dx = dy * min;
                                        w = (int)dx + c->basew;
@@ -254,11 +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(w <= 0 || h <= 0)
+               return;
        if(w == sw && h == sh)
                c->border = 0;
        else
@@ -285,10 +296,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-toggletiled(const char *arg) {
-       if(!sel || lt->arrange == untile)
+togglefloating(const char *arg) {
+       if(!sel || lt->arrange == floating)
                return;
-       sel->isuntiled = !sel->isuntiled;
+       sel->isfloating = !sel->isfloating;
        lt->arrange();
 }
 
@@ -304,6 +315,10 @@ updatesizehints(Client *c) {
                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) {
@@ -322,16 +337,20 @@ updatesizehints(Client *c) {
                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;
-               c->minay = size.min_aspect.y;
                c->maxax = size.max_aspect.x;
+               c->minay = size.min_aspect.y;
                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);
 }