wmii

commit 7738356d03b783c1110e8ba7403f27572ff55a52
parent 99481a3d27d76c7c2f882643931a77d3d0637383
Author: uriel <uriel@localhost.localdomain>
Date:   Wed,  3 Oct 2007 02:54:29 +0200

Merge with sqweek's changes

Diffstat:
cmd/wmii/mouse.c
 | 
6
+++++-
cmd/wmii/x11.c
 | 
3
++-
rc/rc.wmii.rc
 | 
3
++-

3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cmd/wmii/mouse.c b/cmd/wmii/mouse.c
@@ -289,7 +289,11 @@ horiz:
 					resize_frame(f->aprev, f->aprev->r);
 				}
 
-				if (fw->ra != f->area) {
+				if (f->aprev || f->anext) {
+					remove_frame(f);
+					f->area = fw->ra;
+					insert_frame(fw->fp, f);
+				} else if (f->area != fw->ra) {
 					detach_from_area(f);
 					attach_to_area(fw->ra, f);
 				}
diff --git a/cmd/wmii/x11.c b/cmd/wmii/x11.c
@@ -122,7 +122,8 @@ Wfmt(Fmt *f) {
 /* Init */
 void
 initdisplay(void) {
-	display = XOpenDisplay(nil);
+	if(!(display = XOpenDisplay(nil)))
+		fatal("couldn't open display");
 	scr.screen = DefaultScreen(display);
 	scr.colormap = DefaultColormap(display, scr.screen);
 	scr.visual = DefaultVisual(display, scr.screen);
diff --git a/rc/rc.wmii.rc b/rc/rc.wmii.rc
@@ -12,13 +12,14 @@ if(echo $0 | grep -s '(^|/)rc\.wmii\.local$') {
 }
 
 fn config_whatis {
-	prog = `{@{path=$confpath whatis $1} | grep -v '^fn|= ' || echo /dev/null}
+	prog = `{@{path=$confpath whatis $1} | grep -v '^fn|=' || echo /dev/null}
 	shift; echo $prog $*
 }
 
 if(! test -x $PLAN9/bin/read) {
 	echo 'Can''t find the ''read'' command' >[1=2]
 	xmessage -file - <<'!'
+	path=$oldpath
 	exec `{config_whatis wmiirc}
 }
 rc.wmii can't run: