SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Mon Jan 14 13:21:48 2008 +0100
     1.2 +++ b/tinyutils/tazx	Mon Jan 14 13:25:50 2008 +0100
     1.3 @@ -3,7 +3,7 @@
     1.4  # Tazx - Ncurses startx script for SliTaz GNU/Linux using Dialog boxes.
     1.5  # This tinyutils is part of slitaz-tools.
     1.6  #
     1.7 -# 2007/10/08 <pankso@slitaz.org> - GNU gpl v3.
     1.8 +# 20080114 <pankso@slitaz.org> - GNU gpl v3.
     1.9  #
    1.10  : ${DIALOG=dialog}
    1.11  
    1.12 @@ -11,33 +11,41 @@
    1.13  XSERVER=Xvesa
    1.14  DOC=/usr/share/doc/slitaz-tools/tazx.txt
    1.15  MOUSE=/dev/input/mice,5
    1.16 +WM=jwm
    1.17  
    1.18  exec 3>&1
    1.19  value=`$DIALOG --help-button \
    1.20      --clear \
    1.21      --title " Start X on SliTaz " \
    1.22      --menu \
    1.23 -"L'application 'tazx' vous permet de démarrer ou reconfigurer \
    1.24 -votre session X sur votre système GNU/Linux. Syntaxe : \
    1.25 +"L'application 'tazx' vous permet configurer votre session X \
    1.26 +sur votre système GNU/Linux. Syntaxe : \
    1.27  Ecran largeur x hauteur x nb-couleurs" 15 70 5 \
    1.28 -"1" "Screen 640x480x16" \
    1.29 -"2" "Screen 640x480x24" \
    1.30 -"3" "Screen 800x600x16" \
    1.31 -"4" "Screen 800x600x24" \
    1.32 -"5" "Screen 1024x768x16" \
    1.33 -"6" "Screen 1024x768x24" \
    1.34 -"7" "Screen 1280x1024x16" \
    1.35 -"8" "Screen 1280x1024x24" \
    1.36 -"9" "Screen 800x600x16 with XTerm." \
    1.37 -"quit" "Quitter l'application 'tazx'." \
    1.38 +"320x200x8" "PseudoColor" \
    1.39 +"640x480x16" "TrueColor" \
    1.40 +"640x480x24" "TrueColor" \
    1.41 +"800x600x8" "PseudoColor" \
    1.42 +"800x600x16" "TrueColor" \
    1.43 +"800x600x24" "TrueColor" \
    1.44 +"1024x768x8" "PseudoColor" \
    1.45 +"1024x768x16" "TrueColor" \
    1.46 +"1024x768x24" "TrueColor" \
    1.47 +"1280x1024x8" "PseudoColor" \
    1.48 +"1280x1024x16" "TrueColor" \
    1.49 +"1280x1024x24" "TrueColor" \
    1.50 +"1600x1200x8" "PseudoColor" \
    1.51 +"1600x1200x16" "TrueColor" \
    1.52 +"1600x1200x24" "TrueColor" \
    1.53 +"1920x1440x16" "TrueColor" \
    1.54 +"xterm" "800x600x16 avec XTerm." \
    1.55 +"quit" "Quitter l'application." \
    1.56  2>&1 1>&3`
    1.57  retval=$?
    1.58  exec 3>&-
    1.59  
    1.60  case $retval in
    1.61    0)
    1.62 -    continue
    1.63 -  ;;
    1.64 +    continue ;;
    1.65    1)
    1.66      echo "Cancel pressed..."
    1.67      exit 0 ;;
    1.68 @@ -52,38 +60,16 @@
    1.69      else
    1.70        echo "ESC pressed..."
    1.71        exit 0
    1.72 -    fi;;
    1.73 +    fi ;;
    1.74  esac
    1.75  
    1.76  # Set selected value.
    1.77  case $value in
    1.78 -	1)
    1.79 -		SCREEN=640x480x16
    1.80 -		WM=jwm ;;
    1.81 -	2)
    1.82 -		SCREEN=640x480x24
    1.83 -		WM=jwm ;;
    1.84 -	3)
    1.85 -		SCREEN=800x600x16
    1.86 -		WM=jwm ;;
    1.87 -	4)
    1.88 -		SCREEN=800x600x24
    1.89 -		WM=jwm ;;
    1.90 -	5)
    1.91 -		SCREEN=1024x768x16
    1.92 -		WM=jwm ;;
    1.93 -	6)
    1.94 -		SCREEN=1024x768x24
    1.95 -		WM=jwm ;;
    1.96 -	7)
    1.97 -		SCREEN=1280x1024x16
    1.98 -		WM=jwm ;;
    1.99 -	8)
   1.100 -		SCREEN=1280x1024x24
   1.101 -		WM=jwm ;;
   1.102 -	9)
   1.103 +	xterm)
   1.104  		Xvesa -ac -shadow -screen 1024x768x24 -br &
   1.105  		exec xterm -cr green -geometry 80x35+0-0 ;;
   1.106 +	*)
   1.107 +		SCREEN=$value ;;
   1.108  esac
   1.109  
   1.110  # Copy a JWM system config if any in present in user home
   1.111 @@ -91,25 +77,27 @@
   1.112  if [ ! -f "$HOME/.jwmrc" ] ; then
   1.113      cp /etc/jwm/system.jwmrc $HOME/.jwmrc
   1.114  fi
   1.115 -if [ "$SCREEN" = "1280x1024x16" ] ; then
   1.116 +if [ "$SCREEN" = "1280x1024x[0-9]" ] ; then
   1.117      sed -i s/'1024x768.png'/'1280x1024.png'/ $HOME/.jwmrc
   1.118  fi
   1.119 -if [ "$SCREEN" = "1280x1024x24" ] ; then
   1.120 -    sed -i s/'1024x768.png'/'1280x1024.png'/ $HOME/.jwmrc
   1.121 +if [ "$SCREEN" = "1024x768x[0-9]" ] ; then
   1.122 +    sed -i s/'1280x1024.png'/'1024x768.png'/ $HOME/.jwmrc
   1.123  fi
   1.124  
   1.125  # Creat ~/.xsession to keep the configuration selected.
   1.126  #
   1.127 -touch $HOME/.xsession
   1.128 +cat > $HOME/.xsession << EOT
   1.129 +# ~/.xsession: Start X window session on your system.
   1.130 +#
   1.131 +$XSERVER -ac -shadow -screen $SCREEN -mouse $MOUSE &
   1.132 +sleep 1 &
   1.133 +#xterm -bg khaki3 -fg white -cr orange -geometry 80x15+20+20 &
   1.134 +#xpad &
   1.135 +#mpg123 sound.wav &
   1.136 +exec $WM
   1.137 +EOT
   1.138 +
   1.139  chmod 700 $HOME/.xsession
   1.140 -echo "# ~/.xsession: Start X window session on your system." > $HOME/.xsession
   1.141 -echo "#" >> $HOME/.xsession
   1.142 -echo "$XSERVER -ac -shadow -screen $SCREEN -mouse $MOUSE &" >> $HOME/.xsession
   1.143 -echo "sleep 1 &" >> $HOME/.xsession
   1.144 -echo "#xterm -bg khaki3 -fg white -cr orange -geometry 80x15+20+20 &" >> $HOME/.xsession
   1.145 -echo "#xpad &" >> $HOME/.xsession
   1.146 -echo "#mpg123 sound.wav &" >> $HOME/.xsession
   1.147 -echo "exec $WM" >> $HOME/.xsession
   1.148  
   1.149  # End messages.
   1.150  echo "Configuration réussie."