diff --git a/Makefile b/Makefile index 9aecdaee..c1e2aaaf 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,8 @@ include config.mk SUBDIRS = libcext liblitz libixp libwmii cmd BIN = cmd/wm/wmii cmd/wm/wmiiwm cmd/wmiibar cmd/wmiifs \ - cmd/wmiikeys cmd/wmiimenu cmd/wmiiplumb cmd/wmiir cmd/wmiiwarp + cmd/wmiikeys cmd/wmiiplumb cmd/wmiir cmd/wmiiwarp +#cmd/wmiikeys cmd/wmiimenu cmd/wmiiplumb cmd/wmiir cmd/wmiiwarp MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmiibar.1 cmd/wmiifs.1 \ cmd/wmiikeys.1 cmd/wmiimenu.1 cmd/wmiir.1 diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c index 0c08d71e..c821c8c8 100644 --- a/cmd/wm/wm.c +++ b/cmd/wm/wm.c @@ -609,9 +609,6 @@ main(int argc, char *argv[]) } } - if(!address) - usage(); - dpy = XOpenDisplay(0); if(!dpy) { fprintf(stderr, "%s", "wmiiwm: cannot open display\n"); @@ -636,6 +633,10 @@ main(int argc, char *argv[]) XCloseDisplay(dpy); exit(0); } + /* above -c is checked */ + if(!address) + usage(); + XSetErrorHandler(0); x_error_handler = XSetErrorHandler(wmii_error_handler); errstr = nil; diff --git a/cmd/wm/wmii b/cmd/wm/wmii index 6b3aa00c..77f7fdf8 100644 --- a/cmd/wm/wmii +++ b/cmd/wm/wmii @@ -21,6 +21,7 @@ wmiifs -a $WMII_ADDRESS & wmiifspid=$apid wmiiwm -a unix!/tmp/.ixp-$USER/wmiiwm-$WMII_IDENT & wmiikeys -a unix!/tmp/.ixp-$USER/wmiikeys-$WMII_IDENT & +wmiibar -a unix!/tmp/.ixp-$USER/wmiibar-$WMII_IDENT & #wmiimenu -a /tmp/.ixp-$USER/wmiimenu-$WMII_IDENT & sleep 1 diff --git a/cmd/wmiikeys.c b/cmd/wmiikeys.c index 0075f32b..6c970c4b 100644 --- a/cmd/wmiikeys.c +++ b/cmd/wmiikeys.c @@ -689,6 +689,8 @@ process_reset_line(char *line) return; p = strchr(line, ' '); + if(!p) + return; *p = 0; ++p; k = create_key(line, p); diff --git a/rc/status b/rc/status index 026c409d..6b8b00fc 100644 --- a/rc/status +++ b/rc/status @@ -23,8 +23,7 @@ fn statustext { } text=`{statustext} -xwrite /new/data $"text -while(xwrite /1/data $"text) { +while(xwrite /bar/1/data $"text) { sleep 2 text=`{statustext} } diff --git a/rc/wmiirc b/rc/wmiirc index 39cc152b..4098b4b0 100755 --- a/rc/wmiirc +++ b/rc/wmiirc @@ -1,4 +1,4 @@ -#!9PREFIX/bin/rc +#!9PREFIX/bin/rc -x # configure wmii CLIENT_BAR=0 @@ -12,13 +12,11 @@ FONT="fixed" fn xwrite { echo -n $2 | wmiir write $1 } # WMIIWM CONFIGURATION - xwrite /wm/default/bar $CLIENT_BAR xwrite /wm/default/border $CLIENT_BORDER xwrite /wm/default/font $FONT xwrite /wm/default/selcolor $SEL_COLOR xwrite /wm/default/normcolor $NORM_COLOR - for(page in `{wmiir read /wm | grep '^d' | awk '{print $10}'}) { for(area in `{wmiir read /wm/$page | grep '^d' | awk '{print $10}'}) { for(client in `{wmiir read /wm/$page/$area | grep '^d' | awk '{print $10}'}) { @@ -28,10 +26,8 @@ for(page in `{wmiir read /wm | grep '^d' | awk '{print $10}'}) { } } - # WMIIKEYS CONFIGURATION - -cat <