mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with sqweek's changes

This commit is contained in:
uriel 2007-10-03 02:54:29 +02:00
parent 99481a3d27 e389c234e5
commit 7738356d03
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/wmii/mouse.c
View File

@ -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);
}

3
cmd/wmii/x11.c
View File

@ -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);

3
rc/rc.wmii.rc
View File

@ -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: