josesito@josesito-pc:~$ diff /etc/X11/xinit/xinitrc /etc/xdg/xfce4/xinitrc
2d1
< # $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
4,6c3,6
< # /etc/X11/xinit/xinitrc
< #
< # global xinitrc file, used by all X sessions started by xinit (startx)
---
> # fix broken $UID on some system...
> if test "x$UID" = "x"; then
> UID=`id -u`
> fi
8,9c8,174
< # invoke global X session script
< . /etc/X11/Xsession
---
> # create temp file for X resources
> XRESOURCES="/tmp/xrdb-$UID.$$"
>
> # Has to go prior to merging Xft.xrdb, as its the "Defaults" file
> test -r $HOME/.Xdefaults && cat $HOME/.Xdefaults >> $XRESOURCES
>
> # Check if the user wants to override the above defaults (set by
> # mcs ui plugin)
> if test "x$XDG_CONFIG_HOME" = "x" ; then
> XDG_CONFIG_HOME=$HOME/.config
> fi
> BASEDIR=$XDG_CONFIG_HOME/xfce4
>
> if test -r $BASEDIR/Xft.xrdb; then
> cat $BASEDIR/Xft.xrdb >> $XRESOURCES
> elif test -r $XFCE4HOME/Xft.xrdb; then
> mkdir -p $BASEDIR
> cp $XFCE4HOME/Xft.xrdb $BASEDIR/
> cat $BASEDIR/Xft.xrdb >> $XRESOURCES
> else
> # Those are fallback settings, use the ui plugin to change it
> # or add your overrides to ~/.Xresources
> # Xft DPI: 96
> # Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
> # Xft hinting: 1/0
> cat >> $XRESOURCES << EOF
> Xft.dpi: 96
> Xft.hinting: 1
> Xft.hintstyle: hintmedium
> EOF
> fi
>
> # merge in X cursor settings
> test -r $BASEDIR/Xcursor.xrdb && cat $BASEDIR/Xcursor.xrdb >> $XRESOURCES
>
> # ~/.Xresources contains overrides to the above
> test -r $HOME/.Xresources && cat $HOME/.Xresources >> $XRESOURCES
>
> # load all X resources
> xrdb -nocpp -merge $XRESOURCES
> rm -f $XRESOURCES
>
> # load local modmap
> test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
>
> # Launch xscreensaver (if available), but only as non-root user
> test $UID -gt 0 -a -z "$VNCSESSION" && xscreensaver -no-splash &
>
> # Use ssh-agent if installed and not already running. Run it separately
> # so it populates the environment here, so we can clean it up later.
> sshagent=`which ssh-agent`
> kill_sshagent=0
> if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
> eval `$sshagent -s`
> kill_sshagent=1
> fi
>
> # Use dbus-launch if installed.
> if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
> dbuslaunch=`which dbus-launch`
> if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then
> eval `$dbuslaunch --sh-syntax --exit-with-session`
> fi
> fi
>
> # Run xfce4-session if installed
> xfcesm=`which xfce4-session`
> case "x$xfcesm" in
> x|xno*)
> ;;
> *)
> $xfcesm
>
> if test $kill_sshagent -eq 1; then
> eval `$sshagent -k`
> fi
> exit 0
> ;;
> esac
>
>
> ##################
> # IMPORTANT NOTE #
> ##################
>
> # Everything below here ONLY gets executed if you are NOT using xfce4-session
> # (Xfce's session manager). If you are using the session manager, everything
> # below is handled by it, and the code below is not executed at all. If you're
> # not sure if you're using the session manager, type 'ps -e|grep xfce4-session'
> # in a terminal while Xfce is running.
>
> ##################
>
>
> # this is only necessary when running w/o xfce4-session
> xsetroot -solid black -cursor_name watch
>
> # or use old-fashioned startup script otherwise
>
> xfce-mcs-manager
> xfwm4 --daemon
>
> # start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be
> # the new standard. if that directory doesn't exist, try the old
> # ~/Desktop/Autostart method. we're not going to do any migration here.
> if test -d "$XDG_CONFIG_HOME/autostart"; then
> for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do
> grep -q -E "^Hidden=true" "$i" && continue
> if grep -q -E "^OnlyShowIn=" "$i"; then
> # need to test twice, as lack of the line entirely means we still run it
> grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue
> fi
> grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue
>
> # check for TryExec
> trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2`
> if test "$trycmd"; then
> type "$trycmd" >/dev/null 2>&1 || continue
> fi
>
> cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2`
> if test "$cmd" && type "$cmd" >/dev/null 2>&1; then
> $cmd &
> fi
> done
> elif test -d "$HOME/Desktop/Autostart"; then
> for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do
> if test -x $HOME/Desktop/Autostart/$i; then
> $HOME/Desktop/Autostart/$i &
> fi
> done
> fi
>
> xfdesktop&
> orage &
>
> panel=`which xfce4-panel`
> case "x$panel" in
> x|xno*)
> ;;
> *)
> $panel
> ret=$?
> while test $ret -ne 0; do
> xmessage -center -file - -timeout 20 -title Error <<EOF
> A crash occured in the panel
> Please report this to the xfce4-dev@xfce.org list
> or on http://bugs.xfce.org
> Meanwhile the panel will be restarted
> EOF
> cat >&2 <<EOF
> A crash occured in the panel
> Please report this to the xfce4-dev@xfce.org list
> or on http://bugs.xfce.org
> Meanwhile the panel will be restarted
> EOF
> $panel
> ret=$?
> done
> ;;
> esac
>
> if test $kill_sshagent -eq 1; then
> eval `$sshagent -k`
> fi
>
> xsetroot -bg white -fg red -solid black -cursor_name watch
josesito@josesito-pc:~$