r2080 - trunk
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Dec 31 07:31:06 EST 2006
Author: div0
Date: 2006-12-31 07:31:06 -0500 (Sun, 31 Dec 2006)
New Revision: 2080
Modified:
trunk/nexuiz-linux-glx.sh
trunk/nexuiz-linux-sdl.sh
Log:
now parse the +vid_x11_display command line option too
Modified: trunk/nexuiz-linux-glx.sh
===================================================================
--- trunk/nexuiz-linux-glx.sh 2006-12-31 11:17:52 UTC (rev 2079)
+++ trunk/nexuiz-linux-glx.sh 2006-12-31 12:31:06 UTC (rev 2080)
@@ -16,30 +16,54 @@
xserver=
xlayout=
+setdisplay()
+{
+ VALUE=$1
+ VALUE=${VALUE#\"}
+ VALUE=${VALUE%\"}
+ case "$VALUE" in
+ :*)
+ ;;
+ *)
+ VALUE=:$VALUE
+ ;;
+ esac
+ VALUE="$VALUE "
+ xserver="${VALUE%% *}"
+ xserver=${xserver#:}
+ xlayout=${VALUE#* }
+ xlayout=${xlayout% }
+}
+
# now how do we execute it?
if [ -r ~/.nexuiz/data/config.cfg ]; then
while read -r CMD KEY VALUE; do
- VALUE=${VALUE#\"}
- VALUE=${VALUE%\"}
case "$CMD:$KEY" in
seta:vid_x11_display)
- case "$VALUE" in
- :*)
- ;;
- *)
- VALUE=:$VALUE
- ;;
- esac
- VALUE="$VALUE "
- xserver="${VALUE%% *}"
- xserver=${xserver#:}
- xlayout=${VALUE#* }
- xlayout=${xlayout% }
+ setdisplay "$VALUE"
;;
esac
done < ~/.nexuiz/data/config.cfg
fi
+m=0
+for X in "$@"; do
+ case "$m:$X" in
+ 0:+vid_x11_display)
+ m=1
+ ;;
+ 0:+vid_x11_display\ *)
+ setdisplay "${X#+vid_x11_display }"
+ ;;
+ 1:*)
+ setdisplay "$X"
+ m=0
+ ;;
+ *)
+ ;;
+ esac
+done
+
case "$xserver" in
'')
;;
Modified: trunk/nexuiz-linux-sdl.sh
===================================================================
--- trunk/nexuiz-linux-sdl.sh 2006-12-31 11:17:52 UTC (rev 2079)
+++ trunk/nexuiz-linux-sdl.sh 2006-12-31 12:31:06 UTC (rev 2080)
@@ -16,30 +16,54 @@
xserver=
xlayout=
+setdisplay()
+{
+ VALUE=$1
+ VALUE=${VALUE#\"}
+ VALUE=${VALUE%\"}
+ case "$VALUE" in
+ :*)
+ ;;
+ *)
+ VALUE=:$VALUE
+ ;;
+ esac
+ VALUE="$VALUE "
+ xserver="${VALUE%% *}"
+ xserver=${xserver#:}
+ xlayout=${VALUE#* }
+ xlayout=${xlayout% }
+}
+
# now how do we execute it?
if [ -r ~/.nexuiz/data/config.cfg ]; then
while read -r CMD KEY VALUE; do
- VALUE=${VALUE#\"}
- VALUE=${VALUE%\"}
case "$CMD:$KEY" in
seta:vid_x11_display)
- case "$VALUE" in
- :*)
- ;;
- *)
- VALUE=:$VALUE
- ;;
- esac
- VALUE="$VALUE "
- xserver="${VALUE%% *}"
- xserver=${xserver#:}
- xlayout=${VALUE#* }
- xlayout=${xlayout% }
+ setdisplay "$VALUE"
;;
esac
done < ~/.nexuiz/data/config.cfg
fi
+m=0
+for X in "$@"; do
+ case "$m:$X" in
+ 0:+vid_x11_display)
+ m=1
+ ;;
+ 0:+vid_x11_display\ *)
+ setdisplay "${X#+vid_x11_display }"
+ ;;
+ 1:*)
+ setdisplay "$X"
+ m=0
+ ;;
+ *)
+ ;;
+ esac
+done
+
case "$xserver" in
'')
;;
More information about the nexuiz-commits
mailing list