Module Name: xsrc
Committed By: martin
Date: Sat Feb 18 08:54:22 UTC 2012
Modified Files:
xsrc/external/mit/xdm/dist/config: Xservers.ws.cpp
xsrc/external/mit/xinit/dist: startx.cpp
Log Message:
Add -noretro as default server arg in configuration files where we are
sure the user will get a visible window "soon".
The sole reason we backed out the "retro" change from upstream
was to avoid an empty black screen after manualy starting just "X". With
these preconfigured startup mehtods, this confusion can not happen.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xinit/dist/startx.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp
diff -u xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp:1.1.1.2 xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp:1.2
--- xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp:1.1.1.2 Mon Nov 9 07:04:35 2009
+++ xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp Sat Feb 18 08:54:21 2012
@@ -9,4 +9,4 @@ XCOMM you can add them here as well. Ea
XCOMM look like:
XCOMM XTerminalName:0 foreign
XCOMM
-:0 local BINDIR/X :0 DEFAULTVT
+:0 local BINDIR/X :0 -noretro DEFAULTVT
Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.1.1.5 xsrc/external/mit/xinit/dist/startx.cpp:1.2
--- xsrc/external/mit/xinit/dist/startx.cpp:1.1.1.5 Wed Aug 3 02:44:52 2011
+++ xsrc/external/mit/xinit/dist/startx.cpp Sat Feb 18 08:54:21 2012
@@ -75,7 +75,7 @@ sysserverrc=XINITDIR/xserverrc
defaultclient=XTERM
defaultserver=XSERVER
defaultclientargs=""
-defaultserverargs=""
+defaultserverargs="-noretro"
defaultdisplay=":0"
clientargs=""
serverargs=""
