diff --git a/cmd/wmii/Makefile b/cmd/wmii/Makefile index 8f8091c6..c5ce7cc9 100644 --- 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 index 12d9c568..def1e6f7 100644 --- 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 index 6e6e8e41..5b419331 100644 --- 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 index 48c619bf..f9f8fac0 100644 --- 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 index 8c3f7054..6a1b2f1f 100644 --- 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 index 1362284b..3ac1c33c 100644 --- 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 index 55f6776f..2f4ef87d 100644 --- 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 index 38259dad..b9a29bde 100644 --- 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}