wmii

commit 84368de7f3e3ad620cae2814574eee30a09e084d
parent 172ac9ce07d53e9099ea0cedcf7d6231d7d4c9e9
Author: Kris Maglione <jg@suckless.org>
Date:   Sat, 14 Apr 2007 03:03:06 -0400

Cleanup.

Diffstat:
cmd/wmii/Makefile
 | 
1
+
cmd/wmii/client.c
 | 
4
++--
cmd/wmii/dat.h
 | 
9
+++++++--
cmd/wmii/frame.c
 | 
2
--
cmd/wmii/mouse.c
 | 
7
++++---
include/Makefile
 | 
3
+++
mk/common.mk
 | 
3
---
mk/one.mk
 | 
2
++

8 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/cmd/wmii/Makefile b/cmd/wmii/Makefile
@@ -5,6 +5,7 @@ include ${ROOT}/mk/wmii.mk
 main.c: ${ROOT}/mk/wmii.mk
 
 TARG =	wmii
+HFILES=	dat.h fns.h
 
 LIB =	${LIBIXP}
 EXLDFLAGS = -lm ${LIBX11} -lXext
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
@@ -691,7 +691,7 @@ move_client(Client *c, char *arg) {
 	new.x += x;
 	new.y += y;
 	if(!f->area->floating)
-		resize_column(f->client, &new);
+		resize_column(f->client->sel, &new);
 	else
 		resize_client(f->client, &new);
 }
@@ -707,7 +707,7 @@ size_client(Client *c, char *arg) {
 	new.width += w;
 	new.height += h;
 	if(!f->area->floating)
-		resize_column(f->client, &new);
+		resize_column(f->client->sel, &new);
 	else
 		resize_client(f->client, &new);
 }
diff --git a/cmd/wmii/dat.h b/cmd/wmii/dat.h
@@ -78,8 +78,13 @@ enum {
 enum { Coldefault, Colstack, Colmax };
 
 /* Cursor */
-enum { CurNormal, CurNECorner, CurNWCorner, CurSECorner, CurSWCorner,
-	CurDHArrow, CurMove, CurInput, CurInvisible, CurLast };
+enum {
+	CurNormal,
+	CurNECorner, CurNWCorner, CurSECorner, CurSWCorner,
+	CurDHArrow, CurMove, CurInput,
+	CurInvisible,
+	CurLast
+};
 
 enum { NCOL = 16 };
 enum { WM_PROTOCOL_DELWIN = 1 };
diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
@@ -288,9 +288,7 @@ ingrabbox(Frame *f, int x, int y) {
 void
 draw_frame(Frame *f) {
 	BlitzBrush br = { 0 };
-	XPoint pt[3];
 	Frame *tf;
-	int h;
 
 	if(f->view != screen->sel)
 		return;
diff --git a/cmd/wmii/mouse.c b/cmd/wmii/mouse.c
@@ -364,7 +364,7 @@ mouse_resizecol(Divide *d) {
 	View *v;
 	Area *a;
 	uint w, minw;
-	int x;
+	int x, y;
 
 	v = screen->sel;
 
@@ -376,13 +376,14 @@ mouse_resizecol(Divide *d) {
 		return;
 
 	minw = screen->rect.width/NCOL;
-	
+
+	querypointer(blz.root, &x, &y);
 	x = a->rect.x + minw;
 	w = r_east(&a->next->rect) - minw;
 	w -= x;
 
 	cwin = XCreateWindow(blz.dpy, blz.root,
-			x, 0, w, 1,
+			x, y, w, 1,
 			/* border */	0,
 			/* depth */	CopyFromParent,
 			/* class */		InputOnly,
diff --git a/include/Makefile b/include/Makefile
@@ -3,4 +3,7 @@ include ${ROOT}/mk/hdr.mk
 
 HFILES = ixp.h ixp_fcall.h
 
+install: ${HFILES:.h=.install}
+uninstall: ${HFILES:.h=.uninstall}
+
 include ${ROOT}/mk/common.mk
diff --git a/mk/common.mk b/mk/common.mk
@@ -10,9 +10,6 @@ mkdirs:
 		mkdir -pm 0755 $$i; \
 	done
 
-install: ${HFILES:.h=.install}
-uninstall: ${HFILES:.h=.uninstall}
-
 cleandep:
 	rm .depend 2>/dev/null || true
 
diff --git a/mk/one.mk b/mk/one.mk
@@ -17,6 +17,8 @@ oneclean:
 		rm $$i; \
 	done 2>/dev/null || true
 
+${OFILES}: ${HFILES}
+
 ${PROG}: ${OFILES} ${LIB}
 	${LINK} $@ ${OFILES} ${LIB}