wmii

commit bcae524d401cec580d341965853cb662a0dd67e1
parent f6f1b5bf937d90f12ec0a002a7b132ffcfd8e908
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Wed,  8 Feb 2006 17:59:57 +0100

made rc scripts to work, now I can concentrate on WM


Diffstat:
Makefile
 | 
3
++-
cmd/wm/wm.c
 | 
7
++++---
cmd/wm/wmii
 | 
1
+
cmd/wmiikeys.c
 | 
2
++
rc/status
 | 
3
+--
rc/wmiirc
 | 
17
+++++++++--------

6 files changed, 19 insertions(+), 14 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <<END
+cat | wmiir write /keys/reset <<END
 Control-Alt-c 		echo -n kill | wmiir write /wm/sel/sel/sel/ctl
 Control-Alt-q,y 	quit
 Control-Alt-w,y 	wmiirc
@@ -61,11 +57,16 @@ Shift-Alt-6			echo -n select 6 | wmiir write /wm/ctl
 Shift-Alt-7			echo -n select 7 | wmiir write /wm/ctl
 Shift-Alt-8			echo -n select 8 | wmiir write /wm/ctl
 Shift-Alt-9			echo -n select 9 | wmiir write /wm/ctl
-END | wmiir write /keys/reset
+END
 
 xwrite /keys/font $FONT
 xwrite /keys/color $SEL_COLOR
 
+# WMIIBAR CONFIGURATION
+xwrite /bar/font $FONT
+xwrite /bar/defcolor $SEL_COLOR
+echo -n fnord | wmiir write /bar/new/data 
+
 # MISC
-xsetroot -mod 2 2 -bg \#555588 -fg \#666666
+xsetroot -mod 2 2 -bg '#555588' -fg '#666666'
 status&