wmii

commit e66b83eab29d56f9e32a46f3578bf8aef2b8a69d
parent fc5341aaf759c407f55e60c48cd4c4cc438d4e1f
Author: Kris Maglione <kris@suckless.org>
Date:   Fri, 22 Jan 2010 19:31:26 -0500

Fix MWM hint regression. Closes issue #167.

Diffstat:
cmd/wmii/client.c
 | 
4
++--
cmd/wmii/div.c
 | 
2
+-
cmd/wmii/frame.c
 | 
6
++----
config.mk
 | 
13
+++++++------

4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
@@ -750,8 +750,8 @@ updatemwm(Client *c) {
 	}
 	free(ret);
 
-	if(c->sel) {
-		c->sel->floatr = c->r;
+	if(c->sel && false) {
+		c->sel->floatr = client_grav(c, r);
 		if(c->sel->area->floating) {
 			client_resize(c, c->sel->floatr);
 			frame_draw(c->sel);
diff --git a/cmd/wmii/div.c b/cmd/wmii/div.c
@@ -72,7 +72,7 @@ drawimg(Image *img, Color cbg, Color cborder, Divide *d) {
 
 	w = Dx(img->r)/2;
 	n = 0;
-	pt[n++] = Pt(w    ,	0);
+	pt[n++] = Pt(w,		0);
 	pt[n++] = Pt(0,		0);
 	pt[n++] = Pt(w - 1,	w - 1);
 
diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
@@ -283,10 +283,8 @@ frame_gethints(Frame *f) {
 	h.min.x += d.x;
 	h.min.y += d.y;
 	/* Guard against overflow. */
-	if(h.max.x + d.x > h.max.x)
-		h.max.x += d.x;
-	if(h.max.y + d.y > h.max.y)
-		h.max.y += d.y;
+	h.max.x = max(h.max.x + d.x, h.max.x);
+	h.max.y = max(h.max.y + d.y, h.max.y);
 
 	h.base.x += d.x;
 	h.base.y += d.y;
diff --git a/config.mk b/config.mk
@@ -19,6 +19,7 @@ TERMINAL = xterm
 include $(ROOT)/mk/gcc.mk
 CFLAGS += $(DEBUGCFLAGS) -O0
 LDFLAGS += -g
+
 SOLDFLAGS += $(LDFLAGS)
 SHARED = -shared -Wl,-soname=$(SONAME)
 STATIC = -static
@@ -29,17 +30,17 @@ LD = cc
 # Archiver
 AR = ar crs
 
-# Your make shell. By default, the first found of /bin/dash, /bin/ksh,
-# /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh
-# are painfully slow, and should be avoided.
-#BINSH = /bin/ash
-
 X11PACKAGES = xft
 INCX11 = $$(pkg-config --cflags $(X11PACKAGES))
 LIBICONV = # Leave blank if your libc includes iconv (glibc does)
 LIBIXP = $(LIBDIR)/libixp.a
 
-# Operating System Configurations
+# Your make shell. By default, the first found of /bin/dash, /bin/ksh,
+# /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh
+# are painfully slow, and should be avoided.
+#BINSH = /bin/ash
+
+## Operating System Configurations
 
 # KenCC
 # Note: wmii *must* always compile under KenCC. It's vital for