wmii

commit 5bb7a777a8c302ad4b0f6fba5c7f1f3dda5474f8
parent 63ed891ed024d1fda3846f906dab19c320d8544f
Author: Kris Maglione <jg@suckless.org>
Date:   Fri,  8 Feb 2008 21:39:25 -0500

Merge.

Diffstat:
cmd/wmii/client.c
 | 
6
++++--
cmd/wmii/float.c
 | 
2
+-
cmd/wmii/frame.c
 | 
4
++--
mk/dir.mk
 | 
15
++++++++-------
mk/hdr.mk
 | 
4
++--

5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
@@ -97,7 +97,8 @@ client_create(XWindow w, XWindowAttributes *wa) {
 	c->border = wa->border_width;
 
 	c->r.min = Pt(wa->x, wa->y);
-	c->r.max = addpt(c->r.min, Pt(wa->width, wa->height));
+	c->r.max = addpt(c->r.min,
+			 Pt(wa->width, wa->height));
 
 	c->w.type = WWindow;
 	c->w.w = w;
@@ -193,7 +194,8 @@ client_manage(Client *c) {
 	bool newgroup = !c->group
 		     || c->group->ref == 1
 		     || selclient() && (selclient()->group == c->group)
-		     || group_leader(c->group) && !client_viewframe(group_leader(c->group), c->sel->view);
+		     || group_leader(c->group) && !client_viewframe(group_leader(c->group),
+								    c->sel->view);
 
 	f = c->sel;
 	if(!(c->w.ewmh.type & TypeSplash))
diff --git a/cmd/wmii/float.c b/cmd/wmii/float.c
@@ -88,7 +88,7 @@ float_placeframe(Frame *f) {
 		return;
 	*/
 	if(c->fullscreen || c->w.hints->position || starting) {
-		f->r = client_grav(c, c->r);
+		f->r = f->floatr;
 		return;
 	}
 
diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
@@ -29,8 +29,8 @@ frame_create(Client *c, View *v) {
 	if(c->sel) {
 		f->floatr = c->sel->floatr;
 		f->r = c->sel->r;
-	}else{
-		f->r = client_grav(c, ZR);
+	}else {
+		f->r = client_grav(c, c->r);
 		f->floatr = f->r;
 		c->sel = f;
 	}
diff --git a/mk/dir.mk b/mk/dir.mk
@@ -1,23 +1,24 @@
 MKSUBDIR =  targ=$@; targ=$${targ\#d}; \
 	for i in $$dirs; do \
+		export BASE=$(BASE)$$i/; \
 		if [ ! -d $$i ]; then \
 			echo Skipping nonexistent directory: $$i 1>&2; \
 		else \
-			echo MAKE $$targ $(BASE)$$i/; \
-			(cd $$i && $(MAKE) BASE="$(BASE)$$i/" $$targ) || exit $?; \
+			echo MAKE $$targ $$BASE; \
+			(cd $$i && $(MAKE) $$targ) || exit $?; \
 		fi; \
 	done
 
 dall:
-	dirs="$(DIRS)"; $(MKSUBDIR)
+	+dirs="$(DIRS)"; $(MKSUBDIR)
 dclean:
-	dirs="$(DIRS)"; $(MKSUBDIR)
+	+dirs="$(DIRS)"; $(MKSUBDIR)
 dinstall:
-	dirs="$(INSTDIRS)"; $(MKSUBDIR)
+	+dirs="$(INSTDIRS)"; $(MKSUBDIR)
 duninstall:
-	dirs="$(INSTDIRS)"; $(MKSUBDIR)
+	+dirs="$(INSTDIRS)"; $(MKSUBDIR)
 ddepend:
-	dirs="$(DIRS)"; $(MKSUBDIR)
+	+dirs="$(DIRS)"; $(MKSUBDIR)
 
 all: dall
 clean: dclean
diff --git a/mk/hdr.mk b/mk/hdr.mk
@@ -36,8 +36,8 @@ all:
 	$(LINK) $@ $<
 
 .c.O:
-	${COMPILE} ${<:.c=.o} $<
-	${LINK} $@ ${<:.c=.o}
+	$(COMPILE) ${<:.c=.o} $<
+	$(LINK) $@ ${<:.c=.o}
 
 .sh.O:
 	echo FILTER $(BASE)$<