VIGS: sync up to the latest

[platform/adaptation/emulator/xf86-misc-vigs.git] / i386-common / startx

diff --git a/i386-common/startx b/i386-common/startx
index d8e579d..9166ab1 100755 (executable)
--- a/i386-common/startx
+++ b/i386-common/startx
@@ -14,22 +14,44 @@ for scriptlet in $(find /etc/X11/arch-preinit.d ! -type d); do
     test -x "$scriptlet" && . "$scriptlet"
 done
 
+if [ -e /etc/emulator/opengl-es-setup-yagl-env.sh ]; then
+    /etc/emulator/opengl-es-setup-yagl-env.sh
+fi
+
+#remove previous Xorg.0.log file
+if [ -e /var/log/Xorg.0.log ]; then
+    rm /var/log/Xorg.0.log
+fi
+
+#remove previous Xorg.0.log.old file
+if [ -e /var/log/Xorg.0.log.old ]; then
+    rm /var/log/Xorg.0.log.old
+fi
+
 if [ -e ~/.xinitrc ]; then
-       XINITRC=~/.xinitrc
+    XINITRC=~/.xinitrc
 else
-       XINITRC=/etc/X11/xinitrc
+    XINITRC=/etc/X11/xinitrc
 fi
 
 XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
 
 if [ "$1" = "--gdb" ]; then
-       gdb --args Xorg ${XSERVER_OPTIONS}
+    /usr/bin/gdb --args /usr/bin/Xorg ${XSERVER_OPTIONS}
 else
-       if [ "$1" = "--only" ]; then
-
-               Xorg ${XSERVER_OPTIONS} &
-       else
-               xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
-       fi
+    if [ "$1" = "--only" ]; then
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    else
+        export WMRC=/etc/X11/wmrc
+        export WMUSERID=`/usr/bin/id -u app`
+        export WMGROUPID=`/usr/bin/id -g app`
+        export WMUSER=app
+        export WMUSERHOME=/opt/home/app
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    fi
 fi