--- startx.cpp +++ startx.cpp @@ -2,7 +2,7 @@ XCOMM XCOMM This is just a sample implementation of a slightly less primitive -XCOMM interface than xinit. It looks for user .xinitrc and .xserverrc +XCOMM interface than xinit. It looks for user .desk/xinitrc and .desk/xserverrc XCOMM files, then system xinitrc and xserverrc files, else lets xinit choose XCOMM its default. The system xinitrc should probably do things like check XCOMM for .Xresources files and merge them in, start up a window manager, @@ -47,10 +47,10 @@ export PATH #endif -userclientrc=$HOME/.xinitrc +userclientrc=$HOME/.desk/xinitrc sysclientrc=XINITDIR/xinitrc -userserverrc=$HOME/.xserverrc +userserverrc=$HOME/.desk/xserverrc sysserverrc=XINITDIR/xserverrc defaultclient=XTERM defaultserver=XSERVER @@ -232,7 +232,7 @@ if [ x"$enable_xauth" = x1 ] ; then if [ x"$XAUTHORITY" = x ]; then - XAUTHORITY=$HOME/.Xauthority + XAUTHORITY=$HOME/.desk/Xauthority export XAUTHORITY fi @@ -269,7 +269,7 @@ dummy=0 XCOMM create a file with auth information for the server. ':0' is a dummy. - xserverauthfile=$HOME/.serverauth.$$ + xserverauthfile=$HOME/.desk/serverauth.$$ trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie