[hackers] [wmii] Add .POSIX target and change to double quotes in the Makefile. Change 9menu.c parsing a bit. Some rc.wmii fixes.

changeset: 1967:1ec9f18ae193
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Mon Feb 26 15:56:41 2007 -0500
summary: Add .POSIX target and change to double quotes in the Makefile. Change 9menu.c parsing a bit. Some rc.wmii fixes.

diff -r 56561d78f439 -r 1ec9f18ae193 9menu.c
--- a/9menu.c Mon Feb 26 06:53:02 2007 -0500
+++ b/9menu.c Mon Feb 26 15:56:41 2007 -0500
@@ -131,15 +131,15 @@ args(int argc, char **argv)
                         fontname = argv[i+1];
                         i++;
                 } else if (strcmp(argv[i], "-nb") == 0)
- nbgname = argv[++i];
+ nbgname = argv[i][3] ? &argv[i][3] : argv[++i];
                 else if (strcmp(argv[i], "-nf") == 0)
- nfgname = argv[++i];
+ nfgname = argv[i][3] ? &argv[i][3] : argv[++i];
                 else if (strcmp(argv[i], "-sb") == 0)
- sbgname = argv[++i];
+ sbgname = argv[i][3] ? &argv[i][3] : argv[++i];
                 else if (strcmp(argv[i], "-sf") == 0)
- sfgname = argv[++i];
+ sfgname = argv[i][3] ? &argv[i][3] : argv[++i];
                 else if (strcmp(argv[i], "-br") == 0)
- brcname = argv[++i];
+ brcname = argv[i][3] ? &argv[i][3] : argv[++i];
                 else if (strcmp(argv[i], "-teleport") == 0)
                         teleport = Teleport;
                 else if (strcmp(argv[i], "-warp") == 0)
diff -r 56561d78f439 -r 1ec9f18ae193 Makefile
--- a/Makefile Mon Feb 26 06:53:02 2007 -0500
+++ b/Makefile Mon Feb 26 15:56:41 2007 -0500
@@ -1,5 +1,6 @@
 # window manager improved 2 - window manager improved 2
 # (C)opyright MMVI Anselm R. Garbe
+.POSIX:
 
 include config.mk
 
@@ -58,9 +59,9 @@ install: all
         @echo installing executable files to ${DESTDIR}${PREFIX}/bin
         @mkdir -p -m 0755 ${DESTDIR}${PREFIX}/bin
         @for i in ${SCRIPTS}; do \
- sed 's|CONFPREFIX|${CONFPREFIX}|g; \
- s|CONFVERSION|${CONFVERSION}|g; \
- s|AWKPATH|${AWKPATH}|g' < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
+ sed "s|CONFPREFIX|${CONFPREFIX}|g; \
+ s|CONFVERSION|${CONFVERSION}|g; \
+ s|AWKPATH|${AWKPATH}|g" < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
                 chmod 755 ${DESTDIR}${PREFIX}/bin/$$i; \
          done
         @for i in ${BIN}; do\
diff -r 56561d78f439 -r 1ec9f18ae193 config.mk
--- a/config.mk Mon Feb 26 06:53:02 2007 -0500
+++ b/config.mk Mon Feb 26 15:56:41 2007 -0500
@@ -1,5 +1,5 @@
 # wmii version
-VERSION = $$(hg tip --template 'hg\#rev\#')
+VERSION = $$(hg tip --template 'hg{rev}')
 CONFVERSION = 3.5
 
 # Customize below to fit your system
diff -r 56561d78f439 -r 1ec9f18ae193 rc/rc.wmii
--- a/rc/rc.wmii Mon Feb 26 06:53:02 2007 -0500
+++ b/rc/rc.wmii Mon Feb 26 15:56:41 2007 -0500
@@ -25,9 +25,8 @@ fn wmiimenu {
 
 fn 9menu {
         wmii9menu -teleport -font $WMII_FONT \
- -nf $WMII_NORMCOLORS(1) -nb $WMII_NORMCOLORS(2) \
- -sf $WMII_FOCUSCOLORS(1) -sb $WMII_FOCUSCOLORS(2) \
- -br $WMII_FOCUSCOLORS(3) $*
+ -^(nf nb br)^$WMII_NORMCOLORS \
+ -^(sf sb br)^$WMII_FOCUSCOLORS $*
 }
 
 fn config_whatis {
@@ -152,7 +151,7 @@ for(i in `{seq 0 9}) {
 
 # Functions
 fn proglist {
- /bin/ls -lL `{echo $* | sed 'y/ /:'} >[2]/dev/null \
+ /bin/ls -lL `{echo $* | sed 'y/:/ /'} >[2]/dev/null \
                 | awk '$1 ~ /^[^d].*x/ { print $NF }' \
                 | sort | uniq
 }
Received on Mon Feb 26 2007 - 21:57:55 UTC