mirror of
https://github.com/0intro/wmii
synced 2024-11-22 05:42:05 +03:00
Merge with sqweek's changes
This commit is contained in:
commit
7738356d03
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user