slitaz-tools annotate tinyutils/tazx @ rev 494

Update xorg autoconfiguration tool (again)
author Antoine Bodin <gokhlayeh@mailoo.org>
date Mon Jul 05 17:51:53 2010 +0200 (2010-07-05)
parents d2c5ec45b766
children b1be14a7c9e2
rev   line source
pankso@4 1 #!/bin/sh
pankso@4 2 #
pankso@66 3 # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes.
pankso@351 4 # This tinyutils is part of slitaz-tools. Tazx can configure Xvesa kdrive
pankso@351 5 # and Xorg with several Window Manager.
pankso@4 6 #
pankso@450 7 # (c) 2010 SliTaz GNU/Linux - GNU gpl v3.
pankso@209 8 # Authors: Christophe Lincoln <pankso@slitaz.org>
pankso@209 9 # Pascal Bellard <pascal.bellard@slitaz.org>
pankso@4 10 #
pascal@190 11 : ${DIALOG=tazdialog}
pankso@4 12
pankso@450 13 # Default value fo Xvesa.
pankso@4 14 XSERVER=Xvesa
pankso@351 15 KEYBD=keyboard
pankso@351 16 MOUSE=mouse,5,/dev/input/mice
pankso@351 17 WM=openbox
pankso@351 18
pankso@339 19 # Default user for config files in Live mode.
pankso@415 20 USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
pankso@4 21
pankso@66 22 ####################
pankso@66 23 # Tazx functions #
pankso@66 24 ####################
pankso@66 25
gokhlayeh@492 26 # Populate xorg.conf.d.
gokhlayeh@492 27 xorg_conf_d()
pankso@260 28 {
gokhlayeh@492 29 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d)
gokhlayeh@492 30 xorg_config=/etc/X11/xorg.conf.d
gokhlayeh@492 31
gokhlayeh@492 32 # Define the xorg.conf.new place.
gokhlayeh@492 33 xorg_template=/root/xorg.conf.new
gokhlayeh@492 34
gokhlayeh@492 35 # Obtain a default configuration file from Xorg.
gokhlayeh@492 36 Xorg -configure :1
gokhlayeh@492 37
gokhlayeh@492 38 # Put the differents sections in separate files in the configuration directory.
gokhlayeh@492 39 sed -e '/Section "ServerLayout"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template | grep -v Core > $xorg_config/10-ServerLayout.conf
gokhlayeh@492 40 sed -e '/Section "Files"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template > $xorg_config/20-Files.conf
gokhlayeh@492 41 sed -e '/Section "Module"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template > $xorg_config/30-Module.conf
gokhlayeh@492 42 sed -e '/Section "Monitor"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template > $xorg_config/50-Monitor.conf
gokhlayeh@492 43 sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template > $xorg_config/60-Device.conf
gokhlayeh@492 44 sed -e '/Section "Screen"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" $xorg_template > $xorg_config/70-Screen.conf
gokhlayeh@492 45
gokhlayeh@492 46 # Remove the template.
gokhlayeh@492 47 rm $xorg_template
gokhlayeh@492 48
gokhlayeh@492 49 # Configure the keyboard with the right keymap.
gokhlayeh@492 50 keymap=`cat /etc/keymap.conf`
gokhlayeh@492 51 keyboard_config=$xorg_config/40-Keyboard.conf
gokhlayeh@492 52 echo 'Section "InputClass"
gokhlayeh@494 53 Identifier "Keyboard Defaults"
gokhlayeh@494 54 MatchIsKeyboard "yes"' > $keyboard_config
gokhlayeh@494 55 case $keymap in
pankso@260 56 fr_CH-latin1)
pankso@260 57 # Swiss FrenCH
gokhlayeh@492 58 echo ' Option "XkbLayout" "ch"
gokhlayeh@494 59 Option "XkbVariant" "fr"' >> $keyboard_config
gokhlayeh@492 60 ;;
pankso@260 61 en)
pankso@260 62 # Englisk UK
gokhlayeh@492 63 echo ' Option "XkbLayout" "en"
gokhlayeh@494 64 Option "XkbVariant" "en"' >> $keyboard_config
gokhlayeh@492 65 ;;
pankso@260 66 ru)
pankso@260 67 # Russian
gokhlayeh@492 68 echo ' Option "XkbLayout" "us,ru(winkeys)"
gokhlayeh@494 69 Option "XkbVariant" "grp:alt_shift_toggle"' >> $keyboard_config
gokhlayeh@492 70 ;;
pankso@303 71 slovene)
pankso@303 72 # Slovenian
gokhlayeh@492 73 echo ' Option "XkbLayout" "si"
gokhlayeh@494 74 Option "XkbOptions" "grp:alt_shift_toggle"' >> $keyboard_config
gokhlayeh@492 75 ;;
pankso@260 76 *)
pankso@260 77 # Use clean /etc/keymap.conf value.
gokhlayeh@492 78 keymap=${keymap%-latin1}
gokhlayeh@492 79 keymap=${keymap%-lat2}
gokhlayeh@492 80 keymap=${keymap%-lat6}
gokhlayeh@492 81 keymap=${keymap%-abnt2}
gokhlayeh@492 82 echo ' Option "XkbLayout" "'$keymap\" >> $keyboard_config
pankso@260 83 ;;
pankso@260 84 esac
gokhlayeh@492 85
gokhlayeh@492 86 echo 'Endsection' >> $keyboard_config
gokhlayeh@492 87
gokhlayeh@492 88 # Create a xorg.conf if needed.
gokhlayeh@492 89 [ ! -f /etc/X11/xorg.conf ] && echo "# You can put here you're own Xorg configurations.
gokhlayeh@492 90 # This configuration file is readed before all files in /etc/X11/xorg.conf.d
gokhlayeh@492 91 # This file will not be erased by next updates." > /etc/X11/xorg.conf
pankso@260 92 }
pankso@260 93
pankso@117 94 # Install xorg server
pankso@117 95 install_xorg()
pankso@117 96 {
pankso@117 97 tazpkg recharge
pankso@117 98 exec 3>&1
pankso@117 99 value=`$DIALOG --clear --colors --title " Install Xorg " \
pankso@117 100 --menu \
paul@334 101 "The 'tazx' application helps you to select your X driver." 16 70 5 \
pankso@117 102 $(grep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | while read x; do echo $x; echo driver; done) \
pankso@117 103 "quit" "Quitter" \
pankso@117 104 2>&1 1>&3`
pankso@117 105 retval=$?
pankso@117 106 exec 3>&-
pankso@117 107 # Continue, exit...
pankso@117 108 case $retval in
pankso@117 109 1)
pankso@117 110 echo "Cancel pressed..."
pankso@117 111 exit 0 ;;
pankso@117 112 255)
pankso@117 113 if test -z "$value"; then
pankso@117 114 echo "ESC pressed..."
pankso@117 115 exit 0
pankso@117 116 fi ;;
pankso@117 117 esac
pankso@117 118 # Set selected value.
pankso@117 119 case $value in
pankso@117 120 quit)
pankso@117 121 echo "Quit..."
pankso@117 122 exit 0 ;;
pankso@117 123 *)
pankso@117 124 tazpkg get-install xorg-server
pankso@117 125 tazpkg get-install xorg-xf86-video-$value
gokhlayeh@492 126 xorg_conf_d
pankso@117 127 sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf
pankso@117 128 sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf
pankso@351 129 XSERVER=Xorg ;;
pankso@117 130 esac
pankso@117 131 }
pankso@117 132
pankso@66 133 # Screen configuration dialog.
pankso@66 134 screen_config_dialog()
pankso@66 135 {
pankso@66 136 exec 3>&1
pankso@450 137 if [ -x /usr/bin/Xvesa ]; then
pankso@450 138 value=`$DIALOG \
pankso@450 139 --clear --colors \
pankso@450 140 --title " Configure X " \
pankso@450 141 --menu \
pankso@450 142 "The 'tazx' application helps you to configure your X session.\n\
pankso@450 143 Window Manager : \Z2$WM\Zn \n\
pankso@450 144 X server : \Z2Xvesa\Zn" 16 70 5 \
pankso@450 145 $(Xvesa -listmodes 2>&1 | grep ^0x | awk '{ printf "%s %s\n",$2,$3 }' | sort -nr | grep x[1-2][4-6]) \
pankso@450 146 "xterm" "800x600x16" \
pankso@450 147 "xorg" "Install or reconfigure Xorg" \
pankso@450 148 "text" "Disable X autostart" \
pankso@450 149 "quit" "Quit Tazx utility" \
pankso@450 150 2>&1 1>&3`
pankso@450 151 else
pankso@450 152 value=`$DIALOG \
pankso@450 153 --clear --colors \
pankso@450 154 --title " Configure X " \
pankso@450 155 --menu \
pankso@450 156 "The 'tazx' application helps you to configure your X session.\n\
pankso@450 157 Window Manager : \Z2$WM\Zn \n\
pankso@450 158 X server : \Z2Xorg\Zn" 16 70 5 \
pankso@450 159 "xorg" "Install or reconfigure Xorg" \
pankso@450 160 "text" "Disable X autostart" \
pankso@450 161 "quit" "Quit Tazx utility" \
pankso@450 162 2>&1 1>&3`
pankso@450 163 fi
pankso@66 164 retval=$?
pankso@66 165 exec 3>&-
pankso@66 166 # Continue, exit or help...
pankso@66 167 case $retval in
pankso@66 168 0)
pankso@66 169 continue ;;
pankso@66 170 1)
pankso@66 171 echo "Cancel pressed..."
pankso@66 172 exit 0 ;;
pankso@66 173 255)
pankso@66 174 if test -n "$value"; then
pankso@66 175 continue
pankso@66 176 else
pankso@66 177 echo "ESC pressed..."
pankso@66 178 exit 0
pankso@66 179 fi ;;
pankso@66 180 esac
pankso@66 181 # Set selected value.
pankso@66 182 case $value in
pankso@117 183 xorg)
pankso@339 184 install_xorg ;;
pankso@66 185 xterm)
pankso@450 186 # Only with Xvesa
pankso@66 187 Xvesa -ac -shadow -screen 800x600x16 -br &
pankso@66 188 exec xterm -cr orange -geometry 80x35+0-0 ;;
pascal@386 189 text)
pascal@386 190 sed -i s/'slim'/''/ /etc/rcS.conf
pascal@386 191 exit 0 ;;
pankso@66 192 *)
pankso@68 193 NEW_SCREEN=$value ;;
pankso@66 194 esac
pankso@66 195 }
pankso@4 196
pankso@65 197 # Slim config if root.
pankso@66 198 slim_config()
pankso@66 199 {
pankso@66 200 if test $(id -u) = 0; then
paul@317 201 # /etc/X11/screen.conf exists for Live mode, if this file does not
pankso@68 202 # exist tazx is executed at boot time.
pankso@68 203 mkdir -p /etc/X11
pankso@68 204 echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf
pankso@67 205 # Get current screen size and sed config file with the new value.
pankso@66 206 if [ -f /etc/slim.conf ]; then
pankso@351 207 RES=$(grep ^xserver_arguments /etc/slim.conf | \
pankso@351 208 sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
pankso@351 209 #sed -i "s/\(xserver_arguments.*-screen\).*/\1 $NEW_SCREEN/" /etc/slim.conf
pankso@351 210 sed -i s/"-screen $RES"/"-screen $NEW_SCREEN"/ /etc/slim.conf
pankso@66 211 fi
pankso@65 212 fi
pankso@66 213 }
pankso@66 214
pankso@339 215 # Window manager specific configuration.
pankso@339 216 wm_config()
pankso@66 217 {
pankso@339 218 case $WM in
pankso@339 219 ob|openbox)
pankso@339 220 WM=openbox-session
pankso@339 221 XSEVER_OPTS="dpms +extension Composite"
pankso@339 222 # Check if a personal autostart script exists if OB is installed.
pankso@339 223 if [ -d "/var/lib/tazpkg/installed/openbox" ]; then
pankso@339 224 if [ ! -f "$HOME/.config/openbox/autostart.sh" ]; then
pankso@339 225 mkdir -p $HOME/.config/openbox
pankso@339 226 cp /etc/xdg/openbox/autostart.sh $HOME/.config/openbox
pankso@339 227 fi
pankso@339 228 # Script for default user (uid=1000).
pankso@339 229 if [ ! -f "/home/$USER/.config/openbox/autostart.sh" ]; then
pankso@339 230 mkdir -p /home/$USER/.config/openbox
pankso@339 231 cp /etc/xdg/openbox/autostart.sh /home/$USER/.config/openbox
pankso@339 232 fi
pankso@339 233 if [ ! -f "/home/$USER/.config/openbox/menu.xml" ]; then
pankso@339 234 mkdir -p /home/$USER/.config/openbox
pankso@339 235 cp /etc/xdg/openbox/menu.xml /home/$USER/.config/openbox
pankso@339 236 fi
pankso@339 237 chown -R $USER.$USER /home/$USER/.config
pankso@339 238 fi ;;
pankso@339 239 jwm)
pankso@339 240 WM=jwm
pankso@339 241 XSEVER_OPTS="dpms +extension Composite"
pankso@339 242 JWM_CONFIG=$HOME/.jwmrc
pankso@339 243 if [ -d "/var/lib/tazpkg/installed/jwm" ]; then
pankso@339 244 if [ ! -f "$JWM_CONFIG" ]; then
pankso@339 245 cp /etc/jwm/system.jwmrc $JWM_CONFIG
pankso@339 246 fi
pankso@339 247 # In Live mode default user/root JWM config does not exist and
pankso@402 248 # $HOME is not set, this is because tazx is executed by boot
pankso@339 249 # scripts.
pankso@339 250 if [ ! -f "/home/$USER/.jwmrc" ]; then
pankso@339 251 cp /etc/jwm/system.jwmrc /home/$USER/.jwmrc
pankso@339 252 chown $USER.$USER /home/$USER/.jwmrc
pankso@339 253 fi
pankso@339 254 if [ ! -f "/root/.jwmrc" -a `id -u` = 0 ]; then
pankso@339 255 cp /etc/jwm/system.jwmrc /root/.jwmrc
pankso@339 256 fi
pankso@339 257 fi ;;
pankso@339 258 pekwm)
pankso@339 259 WM=pekwm
pankso@339 260 XSEVER_OPTS="dpms"
pankso@339 261 if [ -d "/var/lib/tazpkg/installed/pekwm" ]; then
pankso@339 262 if [ -d "$HOME/.pekwm" ]; then
pankso@339 263 cp -R /etc/pekwm $HOME/.pekwm
pankso@339 264 fi
pankso@339 265 # In Live mode we want config before starting pekwm the first time.
pankso@339 266 if [ ! -d "/home/$USER/.pekwm" ]; then
pankso@339 267 cp -R /etc/pekwm /home/$USER/.pekwm
pankso@339 268 chown -R $USER.$USER /home/$USER/.pekwm
pankso@339 269 chmod +x /home/$USER/.pekwm/start
pankso@339 270 fi
pankso@339 271 if [ ! -d "/root/.pekwm" -a `id -u` = 0 ]; then
pankso@339 272 cp -R /etc/pekwm /root/.pekwm
pankso@339 273 chmod +x /root/.pekwm/start
pankso@339 274 fi
pankso@339 275 fi ;;
pankso@339 276 e17|enlightenment)
pankso@339 277 WM=enlightenment_start
pankso@339 278 XSEVER_OPTS="dpms -terminate" ;;
pankso@339 279 fluxbox)
pankso@339 280 WM=startfluxbox
pankso@339 281 XSEVER_OPTS="dpms" ;;
pankso@339 282 dwm|karmen)
pankso@339 283 WM=$WM-session
pankso@339 284 XSEVER_OPTS="dpms" ;;
pankso@339 285 awesome)
pankso@339 286 WM=awesome
pankso@339 287 XSEVER_OPTS="dpms" ;;
erjo@396 288 xfce|xfce4)
erjo@396 289 WM=xfce4-session
erjo@396 290 XSEVER_OPTS="dpms -terminate" ;;
pankso@339 291 esac
pankso@81 292 }
pankso@81 293
pankso@68 294 # Sample xinitrc for user (WM can be specified with F1 at slim login).
pankso@68 295 xinitrc_sample()
pankso@68 296 {
pankso@68 297 cat > $FILE << "EOF"
pankso@68 298 # ~/.xinitrc: Executed by slim login manager to startx X session.
pankso@339 299 # You can use F1 with Slim to chage your window manager or configure
pankso@339 300 # it permanently with your personnal applications.conf file.
pankso@68 301 #
pankso@339 302 . $HOME/.config/slitaz/applications.conf
pankso@99 303
pankso@117 304 case $1 in
pankso@339 305 e17|enlightenment*)
pankso@315 306 exec enlightenment_start ;;
pankso@162 307 openbox|openbox-session|ob)
pankso@315 308 exec openbox-session ;;
pankso@315 309 dwm|dwm-session)
pankso@315 310 exec dwm-session ;;
pankso@339 311 fluxbox|startfluxbox)
pankso@339 312 exec startfluxbox ;;
pankso@339 313 awesome)
pankso@339 314 exec awesome ;;
pankso@339 315 pekwm)
pankso@339 316 exec pekwm ;;
pankso@339 317 karmen|karmen-session)
pankso@339 318 exec karmen-session ;;
pankso@117 319 jwm)
pankso@81 320 lxpanel &
pankso@315 321 exec jwm ;;
erjo@396 322 xfce|xfce4|xfce4-session)
erjo@396 323 xfce4-session ;;
pankso@117 324 *)
pankso@339 325 exec $WINDOW_MANAGER ;;
pankso@68 326 esac
pankso@68 327 EOF
pankso@339 328 # Set default WM in applications.conf user file. Default WM can be
pankso@339 329 # configured graphicaly with 'desktopbox tazapps'
pankso@339 330 . $CONFIG
pankso@339 331 sed -i s/"WINDOW_MANAGER=.*"/"WINDOW_MANAGER=\"$WM\""/ \
pankso@339 332 $CONFIG
pankso@68 333 }
pankso@68 334
pankso@65 335 # ~/.xinitrc for slim login.
pankso@66 336 creat_xinitrc()
pankso@66 337 {
pankso@68 338 FILE=$HOME/.xinitrc
pankso@339 339 CONFIG=$HOME/.config/slitaz/applications.conf
pankso@339 340 if [ ! -f $CONFIG ]; then
pankso@339 341 mkdir -p $HOME/.config/slitaz
pankso@339 342 cp /etc/slitaz/applications.conf $CONFIG
pankso@339 343 fi
pankso@68 344 xinitrc_sample
pankso@209 345 # In Live mode default user needs a xinitrc, since tazx
pankso@68 346 # is executed only by root.
pankso@209 347 if [ ! -f /home/$USER/.xinitrc ]; then
pankso@209 348 FILE=/home/$USER/.xinitrc
pankso@339 349 CONFIG=/home/$USER/.config/slitaz/applications.conf
pankso@339 350 if [ ! -f $CONFIG ]; then
pankso@339 351 mkdir -p /home/$USER/.config/slitaz
pankso@339 352 cp /etc/slitaz/applications.conf $CONFIG
pankso@339 353 fi
pankso@68 354 xinitrc_sample
pankso@209 355 chown $USER.$USER $FILE
pankso@339 356 chown -R $USER.$USER /home/$USER/.config/slitaz
pankso@105 357 fi
pankso@66 358 }
pankso@45 359
MikeDSmith25@252 360 # Create ~/.xsession to keep the configuration selected (used
MikeDSmith25@252 361 # only by startx, Slim login manager uses .xinitrc).
pankso@66 362 creat_xsession()
pankso@66 363 {
pankso@68 364 cat > $HOME/.xsession << _EOF_
pankso@68 365 # ~/.xsession: Start X window session manually on your system (startx).
pankso@37 366 #
pankso@68 367 _EOF_
pankso@450 368 if [ -x /usr/bin/Xorg ]; then
pankso@117 369 echo 'Xorg &' >> $HOME/.xsession
pankso@117 370 else
pankso@351 371 cat >> $HOME/.xsession << _EOT_
pankso@450 372 Xvesa -ac -shadow $XSEVER_OPTS \\
pankso@351 373 -screen $NEW_SCREEN \\
pankso@351 374 -keybd $KEYBD \\
pankso@351 375 -mouse $MOUSE &
pankso@351 376 _EOT_
pankso@117 377 fi
pankso@117 378 echo '#xterm &' >> $HOME/.xsession
pankso@117 379 echo '#xpad &' >> $HOME/.xsession
pankso@99 380 # LXpanel by default with JWM.
pankso@117 381 if [ "$WM" = "jwm" ]; then
pankso@99 382 echo 'lxpanel &' >> $HOME/.xsession
pankso@99 383 fi
pankso@104 384 echo "exec $WM" >> $HOME/.xsession
pankso@66 385 chmod 700 $HOME/.xsession
pankso@66 386 }
pankso@4 387
pankso@66 388 ###################
pankso@66 389 # Tazx sequence #
pankso@66 390 ###################
pankso@66 391
pankso@351 392 case "$1" in
pankso@351 393 show-config)
pankso@351 394 . /etc/X11/screen.conf
pankso@351 395 echo ""
pankso@351 396 echo "X11 screen resolution: $SCREEN"
pankso@351 397 echo ""
pankso@351 398 echo "Slim configuration for X server:"
pankso@351 399 cat /etc/slim.conf | grep ^default_xserver
pankso@351 400 cat /etc/slim.conf | grep ^xserver_arguments
pankso@351 401 echo "" ;;
pankso@351 402 install-xorg)
pankso@351 403 # WM can be specified on cmdline.
pankso@351 404 if [ -n "$2" ]; then
pankso@402 405 WM=$2
pankso@351 406 fi
pankso@351 407 install_xorg
pankso@351 408 slim_config
pankso@351 409 wm_config
pankso@351 410 creat_xinitrc
pankso@351 411 creat_xsession ;;
pankso@415 412 config-xorg)
pankso@415 413 # WM can be specified on cmdline.
pankso@415 414 if [ -n "$2" ]; then
pankso@415 415 WM=$2
pankso@415 416 fi
pankso@415 417 XSERVER="Xorg"
pankso@415 418 wm_config
pankso@415 419 creat_xinitrc
pankso@415 420 creat_xsession
gokhlayeh@492 421 xorg_conf_d ;;
pankso@351 422 *)
pankso@351 423 # WM can be specified on cmdline.
pankso@351 424 if [ -n "$1" ]; then
pankso@402 425 WM=$1
pankso@351 426 fi
pankso@351 427 [ -n "$NEW_SCREEN" ] || screen_config_dialog
pankso@351 428 slim_config
pankso@351 429 wm_config
pankso@351 430 creat_xinitrc
pankso@351 431 creat_xsession ;;
pankso@351 432 esac
pankso@4 433
pankso@4 434 exit 0