slitaz-tools annotate tinyutils/tazx @ rev 926

slitaz-config: connect to hidden Wi-Fi; browser, editor, file-manager, terminal: use XDG variable if possible; tazx: code simplification and many small improvements; translations: make pot, msgmerge.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Nov 20 06:04:24 2014 +0200 (2014-11-20)
parents a37f6f8dda42
children cc4c1b19fedc
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.
al@926 4 # This tinyutil is part of slitaz-tools. Tazx can configure Xorg with
pankso@626 5 # several Window Managers. The GTK interface to configure X is in tazbox.
pankso@4 6 #
pascal@821 7 # (c) 2011-2014 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 #
pankso@837 11
paul@838 12 # 20140317: most xsession, xinitrc are obsolete, provided system files
pankso@840 13 # are in /etc/skel and WM config files should no longer be copied by
pankso@840 14 # tazx to user home. If some configs are needed by WMs they should
pankso@840 15 # be set by a /usr/bin/wmname-session script I guess. - Pankso
pankso@837 16
al@813 17 . /lib/libtaz.sh
al@813 18 . /etc/slitaz/slitaz.conf
pankso@840 19 . /etc/slitaz/applications.conf
pankso@840 20
al@813 21 export TEXTDOMAIN='slitaz-tools' #i18n
pascal@916 22 : ${DIALOG=dialog --timeout 60}
pankso@4 23
pankso@534 24 # Default user for config files in Live mode, id is 1000 since it is
pankso@534 25 # created by /etc/init.d/bootopts.sh.
al@926 26
al@926 27 USER=$(awk -F: '/1000/{print $1}' /etc/passwd)
al@926 28
pankso@4 29
pankso@628 30 #
pankso@615 31 # Functions
pankso@628 32 #
pankso@615 33
al@926 34
al@813 35 # Save chunk of xorg.conf into specified file
al@926 36
al@813 37 save_chunk() {
al@813 38 sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \
al@926 39 -e "s/EndSection/&\n/" $xorg_template > \
al@813 40 $xorg_config/$1.conf
pankso@615 41 }
pankso@66 42
al@926 43
al@926 44 # Create a xorg.conf if needed
al@926 45
pankso@871 46 gen_xorg_conf_file() {
pankso@871 47 if [ ! -f /etc/X11/xorg.conf ]; then
pankso@871 48 cat > /etc/X11/xorg.conf << EOT
pankso@871 49 # You can put here your own Xorg configurations. This config file is read
pankso@871 50 # before all files in /etc/X11/xorg.conf.d and will NOT be erased by any
pankso@871 51 # updates.
pankso@871 52 EOT
pankso@871 53 fi
pankso@871 54 }
pankso@871 55
al@926 56
al@926 57 # Add or remove xkb applet from lxpanel
al@926 58
al@926 59 xkb() {
al@926 60 case $(id -u) in
al@926 61 0)
al@926 62 # Empty if lxpanel not running, else something like:
al@926 63 # tux lxpanel -p slitaz
al@926 64 LXPS=$(ps -ouser,args | sed -n '/[l]xpanel/ s| *| |p' | \
al@926 65 fgrep -v '[' | fgrep -v 'xkb' | fgrep -v 'sh')
al@926 66
al@926 67 # Stop lxpanel
al@926 68 if [ -n "$LXPS" ]; then
al@926 69 lxpanelctl exit
al@926 70 killall lxpanel
al@926 71 fi
al@926 72
al@926 73 # For all human users
al@926 74 for USER in $(awk -F: '/\/home\//{print $1}' /etc/passwd); do
al@926 75 su $USER -c '. ~/.profile; tazx xkb'
al@926 76 done
al@926 77
al@926 78 # Re-run lxpanel
al@926 79 [ -n "$LXPS" ] && su ${LXPS%% *} -c "exec ${LXPS#* }" &
al@926 80 ;;
al@926 81
al@926 82 *)
al@926 83 DOTCONFIG=${XDG_CONFIG_HOME:-$HOME/.config}
al@926 84 CFG_LXPANEL=$DOTCONFIG/lxpanel
al@926 85
al@926 86 if [ ! -d $CFG_LXPANEL ]; then
al@926 87 mkdir -p $DOTCONFIG
al@926 88 cp -r /etc/lxpanel $DOTCONFIG
al@926 89 fi
al@926 90
al@926 91 case $(fgrep 'XkbLayout' /etc/X11/xorg.conf.d/40-Keyboard.conf | \
al@926 92 fgrep -o ',') in
al@926 93 '')
al@926 94 for CFG in $(find $CFG_LXPANEL -type f -name panel); do
al@926 95 if [ -n "$(grep 'type = xkb' $CFG)" ]; then
al@926 96 echo "Remove xkb applet from $CFG"
al@926 97 sed -i "$(grep -n -e "^Plugin {" -e "^}" -e "xkb" \
al@926 98 $CFG | grep -C 1 xkb | grep -v xkb | cut -d: \
al@926 99 -f1 | tr '\n' ' ' | sed 's| |,|')d" $CFG
al@926 100 fi
al@926 101 done ;;
al@926 102 ',')
al@926 103 for CFG in $(find $CFG_LXPANEL -type f -name panel); do
al@926 104 if [ -z "$(grep 'type = xkb' $CFG)" ]; then
al@926 105 echo "Add xkb applet to $CFG"
al@926 106 XKB='Plugin {\
al@926 107 type = xkb\
al@926 108 Config {\
al@926 109 DisplayType=0\
al@926 110 PerWinLayout=0\
al@926 111 NoResetOpt=0\
al@926 112 KeepSysLayouts=1\
al@926 113 Model=pc105\
al@926 114 LayoutsList=us\
al@926 115 VariantsList=,\
al@926 116 ToggleOpt=shift_caps_toggle\
al@926 117 FlagSize=4\
al@926 118 }\
al@926 119 }\
al@926 120 '
al@926 121 sed -i "$(grep -n -e "^Plugin {" -e "tray" $CFG | \
al@926 122 grep -B1 tray | head -n1 | cut -d: -f1) i\\
al@926 123 $XKB" $CFG
al@926 124 fi
al@926 125 done ;;
al@926 126 esac ;;
al@926 127 esac
al@926 128 }
al@926 129
al@926 130
pankso@870 131 # Generate or regenerate 40-Keyboard.conf
al@926 132
pankso@870 133 keyboard_conf() {
al@926 134 # Configure the keyboard with the right keymap
al@813 135 keymap=$(cat /etc/keymap.conf)
pankso@874 136 keyboard_config="/etc/X11/xorg.conf.d/40-Keyboard.conf"
al@779 137 variant=""
al@926 138
al@779 139 # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev)
al@779 140 options="terminate:ctrl_alt_bksp"
al@926 141 _n 'Creating:'; echo -n " $keyboard_config"
pankso@874 142 mkdir -p $(dirname $keyboard_config)
al@926 143
pankso@874 144 case "$keymap" in
pankso@260 145 fr_CH-latin1)
pankso@260 146 # Swiss FrenCH
al@779 147 layout="ch"; variant="fr" ;;
pankso@597 148 uk)
paul@617 149 # English UK
al@779 150 layout="gb" ;;
pankso@260 151 ru)
pankso@260 152 # Russian
al@779 153 layout="us,ru"
al@926 154 options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;;
al@813 155 ua)
al@813 156 # Ukrainian
al@813 157 layout="us,ua,ru"
al@926 158 options="grp:ctrl_shift_toggle, compose:ralt, $options" ;;
pankso@303 159 slovene)
pankso@303 160 # Slovenian
al@779 161 layout="si"; options="grp:alt_shift_toggle, $options" ;;
pankso@577 162 us-acentos)
al@779 163 layout="us"; variant="intl" ;;
pankso@260 164 *)
pankso@260 165 # Use clean /etc/keymap.conf value.
gokhlayeh@492 166 keymap=${keymap%-latin1}
gokhlayeh@492 167 keymap=${keymap%-lat2}
gokhlayeh@492 168 keymap=${keymap%-lat6}
al@779 169 layout=${keymap%-abnt2}
pankso@260 170 esac
al@926 171
al@779 172 cat > $keyboard_config << EOC
al@779 173 Section "InputClass"
al@779 174 Identifier "Keyboard Defaults"
al@779 175 MatchIsKeyboard "yes"
al@779 176 Option "XkbLayout" "$layout"
al@779 177 Option "XkbVariant" "$variant"
al@779 178 Option "XkbOptions" "$options"
al@779 179 EndSection
al@779 180 EOC
al@926 181
pankso@874 182 status
al@926 183 [ -z "$variant" ] && sed -i '/XkbVariant/d' $keyboard_config
al@926 184 xkb
pankso@870 185 }
pankso@870 186
al@926 187
al@926 188 # Populate xorg.conf.d
al@926 189
pankso@870 190 xorg_conf_d() {
pankso@870 191 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d)
pankso@870 192 xorg_config=/etc/X11/xorg.conf.d
pankso@870 193
pankso@870 194 # Define the xorg.conf.new place.
pankso@870 195 xorg_template=/root/xorg.conf.new
pankso@870 196
pankso@870 197 # Obtain a default configuration file from Xorg.
pankso@870 198 Xorg -configure :2
pankso@870 199
pankso@870 200 # Backup existing config.
al@926 201 tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null
pankso@870 202
pankso@870 203 # Put the different sections in separate files in the config directory.
pankso@870 204 save_chunk 10-ServerLayout
pankso@870 205 sed -i '/Core/d' $xorg_config/10-ServerLayout.conf
pankso@870 206 save_chunk 20-Files
pankso@870 207 save_chunk 30-Module
pankso@870 208 save_chunk 50-Monitor
pankso@870 209 save_chunk 60-Device
pankso@870 210 save_chunk 70-Screen
pankso@870 211
pankso@870 212 # Remove the template.
pankso@870 213 rm $xorg_template
pankso@870 214
pankso@871 215 # Keyboard & xorg.conf
pankso@870 216 keyboard_conf
pankso@871 217 gen_xorg_conf_file
pankso@260 218 }
pankso@260 219
al@926 220
al@926 221 # Process dialog's return code.
al@926 222
psychomaniak@912 223 dialog_end() {
psychomaniak@912 224 retval=$?
psychomaniak@912 225 exec 3>&-
psychomaniak@912 226 # Continue or exit.
psychomaniak@912 227 case $retval in
al@926 228 0|3) continue ;;
al@926 229 1|255) exit 0 ;;
psychomaniak@912 230 esac
psychomaniak@912 231 }
psychomaniak@912 232
al@926 233
paul@549 234 # Install xorg server.
al@926 235
al@813 236 install_xorg() {
al@926 237 [ -f "$PKGS_DB/packages.list" ] || tazpkg recharge
al@926 238
pankso@117 239 exec 3>&1
al@926 240
al@926 241 driver=$($DIALOG \
al@926 242 --clear --colors --scrollbar --title " $(_ 'Install Xorg') " \
al@926 243 --menu "$(_ 'Tazx helps you to select your X driver.')" 16 70 9 \
al@926 244 'auto' "$(_ 'Auto configuring')" \
al@926 245 $(fgrep xorg-xf86-video- $PKGS_DB/packages.list | cut -d- -f4 | \
al@926 246 sed "s|.*|& $(_ 'driver')|") \
al@926 247 'quit' "$(_ 'Quit')" \
al@926 248 2>&1 1>&3)
al@926 249
psychomaniak@912 250 dialog_end
al@813 251
al@926 252 case $driver in
pankso@628 253 quit) exit 0 ;;
al@926 254 auto) autoselect_driver ;;
pankso@117 255 *)
psychomaniak@912 256 inst_pkg xorg-server
al@926 257 inst_pkg xorg-xf86-video-$driver
pankso@628 258 xorg_conf_d ;;
pankso@117 259 esac
pankso@117 260 }
pankso@117 261
al@925 262
al@926 263 # Auto-select and install Xorg driver.
al@926 264
psychomaniak@918 265 autoselect_driver() {
al@925 266 inst_pkg xorg-server
al@925 267
al@924 268 for VID in $(busybox lspci | grep 'Class 03' | cut -c21-24 | sort -u); do
al@924 269 case $VID in
al@924 270 1022|1002) d=ati ;;
al@924 271 8086) d=intel ;;
al@924 272 10de) d=nouveau ;;
al@924 273 1039) d=sis ;;
al@924 274 15ad) d=vmware ;;
al@925 275 *) d=''; $DIALOG --colors --msgbox \
al@926 276 "\n\Z1$(_n 'Failed to setup driver')\Zn $(_ '(unknown hardware)')" 7 68 ;;
al@924 277 esac
al@925 278 [ -n "$d" ] && inst_pkg xorg-xf86-video-$d
al@924 279 done
al@925 280
al@925 281 xorg_conf_d
psychomaniak@918 282 }
psychomaniak@918 283
al@926 284
al@926 285 # Install specified package.
al@926 286
psychomaniak@912 287 inst_pkg() {
al@926 288 pkg="$@"
al@926 289 colorize 3 $(_ 'Installing pkg: $pkg')
al@926 290
al@926 291 case $(id -u) in
al@926 292 0) CMD="tazpkg -gi $@" ;;
al@926 293 *) CMD="sudo tazpkg -gi $@" ;;
al@926 294 esac
al@926 295 [ -d "$INSTALLED/$@" ] || $CMD
psychomaniak@909 296 }
psychomaniak@909 297
al@926 298
al@926 299 # Select/install Window Manager and favorite applications.
al@926 300
psychomaniak@912 301 apps_dialog() {
al@926 302 . $user_conf
al@926 303
psychomaniak@912 304 exec 3>&1
al@926 305
psychomaniak@918 306 app=$($DIALOG --clear --colors --backtitle "$msg" \
al@926 307 --title "{\Z3 $(_n 'Install Window Manager and applications') \Zn}" \
psychomaniak@918 308 --inputmenu "" 21 52 18 \
al@926 309 $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do
al@926 310 eval n='$'$a; echo $a $n;
al@926 311 done) 2>&1 1>&3)
psychomaniak@912 312 dialog_end
al@926 313
psychomaniak@912 314 case $app in
al@926 315 RENAMED) # like: RENAMED EDITOR myeditor
al@926 316 appname=$(echo $app | cut -d" " -f3)
al@926 317 app=$(echo $app | cut -d" " -f2) ;;
psychomaniak@912 318 *)
al@926 319 app_name_dialog only-installed ;;
psychomaniak@912 320 esac
al@926 321
al@926 322 if [ $appname != " " ]; then
al@926 323 if [ $appname = show_ALL ]; then
al@926 324 app_name_dialog full-list
psychomaniak@912 325 fi
al@926 326 if [ -z $(busybox which $appname) ]; then
al@926 327 inst_pkg $(lzcat $PKGS_DB/files.list.lzma | fgrep /bin/$appname | head -n1 | cut -d: -f1)
al@926 328 fi
al@926 329 sed -i "/$app/ s|=.*$|=$appname|" $user_conf
psychomaniak@912 330 fi
al@926 331
al@926 332 msg=''; apps_dialog # loop
psychomaniak@912 333 }
psychomaniak@912 334
al@926 335
al@926 336 # Show list of applications to choose.
al@926 337
psychomaniak@912 338 app_name_dialog() {
al@926 339 case $1 in
al@926 340 full-list) height=24 ;;
al@926 341 *) height=18 ;;
al@926 342 esac
al@926 343
psychomaniak@912 344 exec 3>&1
al@926 345
al@926 346 appname=$($DIALOG --clear --colors --title "$app" \
al@926 347 --menu '' $height 50 24 $(gen_applist $app $@) 2>&1 1>&3)
psychomaniak@912 348 dialog_end
psychomaniak@912 349 }
psychomaniak@912 350
al@926 351
al@926 352 # Generate application list for Dialog or Yad.
al@926 353
psychomaniak@912 354 gen_applist() {
al@926 355 # $1 = [ FILE_MANAGER | BROWSER | EDITOR | TERMINAL | WINDOW_MANAGER ]
al@926 356 # $2 = [ only-installed | full-list ]
al@926 357 # $3 = [ yad | * ]
al@926 358
al@926 359 . $user_conf
al@926 360
al@926 361 FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger \
al@926 362 spacefm thunar xfe ytree"
al@926 363
al@926 364 BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \
al@926 365 links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb"
al@926 366
al@926 367 EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit \
al@926 368 mousepad mp-5 nano qedit SciTE vi vim xedit xfw zile"
al@926 369
al@926 370 TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda \
al@926 371 urxvt vte xterm yeahconsole"
al@926 372
al@926 373 WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox \
al@926 374 icewm jwm lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison \
al@926 375 xfwm4"
psychomaniak@912 376
psychomaniak@912 377 eval list='$'"$1"S
psychomaniak@912 378 eval current='$'"$1"
al@926 379
al@926 380 for i in $current $(echo " $list " | sed "s| $current | |g"); do
al@926 381
al@926 382 case $(busybox which $i) in
al@926 383 '') # not installed
al@926 384 t='---' ;;
al@926 385 *) # installed
al@926 386 t='<--' ;;
al@926 387 esac
al@926 388
al@926 389 if [ "$2" == 'full-list' ] || [ "$t" == '<--' ]; then
al@926 390 echo "$i"
al@926 391
al@926 392 if [ "$3" != 'yad' ]; then
al@926 393 echo "$(echo $t | sed "s|---|$(_n 'Install')|g")"
al@926 394 fi
al@926 395 fi
al@926 396 done
al@926 397
al@926 398 if [ "$2" == 'only-installed' ] && [ "$3" != 'yad' ]; then
al@926 399 echo 'show_ALL' "+$(_n 'Install')"
psychomaniak@912 400 fi
psychomaniak@912 401 }
psychomaniak@912 402
al@926 403
psychomaniak@912 404 # Screen configuration dialog.
al@926 405
al@813 406 config_dialog() {
al@926 407 . /etc/rcS.conf
al@926 408 case $LOGIN_MANAGER in
al@926 409 slim) LM="$(_ 'ON')" ;;
al@926 410 *) LM="$(_ 'OFF')" ;;
al@926 411 esac
psychomaniak@909 412
pankso@66 413 exec 3>&1
al@926 414
al@813 415 value=$($DIALOG \
pankso@535 416 --clear --colors \
pankso@840 417 --title "{ $(_n 'SliTaz Xorg config') }" \
pankso@840 418 --menu "" 16 72 10 \
pankso@840 419 "xorg" "$(_n 'Install or reconfigure Xorg')" \
pankso@840 420 "xorg-light" "$(_n 'Install Xorg server (light version)')" \
al@926 421 "onboot" "$(_n 'AutoStart Xorg by SLiM on boot'): \Z5$LM\Zn" \
psychomaniak@909 422 "slim" "$(_n '(Re)Start Simple Login Manager now')" \
al@926 423 "wm_apps" "$(_n 'Install Window Manager and applications')" \
pankso@840 424 "quit" "$(_n 'Quit Tazx utility')" \
al@813 425 2>&1 1>&3)
psychomaniak@912 426 dialog_end
al@926 427
pankso@840 428 case "$value" in
psychomaniak@912 429 xorg)
pankso@339 430 install_xorg ;;
al@926 431
pankso@840 432 xorg-light)
psychomaniak@912 433 inst_pkg xorg-server-light
psychomaniak@912 434 inst_pkg xorg-xf86-video-fbdev
pankso@840 435 xorg_conf_d ;;
al@926 436
psychomaniak@909 437 onboot)
al@926 438 inst_pkg slim
al@926 439 inst_pkg dbus
al@926 440
al@926 441 if [ $LM == "$(_ 'OFF')" ]; then
al@926 442 LM='slim'
al@926 443 else
al@926 444 LM=''
psychomaniak@909 445 fi
al@926 446 sed -i "/LOGIN_MANAGER/ s|=.*$|=$LM|" /etc/rcS.conf
al@926 447
al@926 448 [ -z "$LM" ] && LM='disabled'
al@926 449 _n "Start X on boot:"; boldify " $LM" ;;
al@926 450
psychomaniak@909 451 slim)
al@926 452 inst_pkg slim
al@926 453 inst_pkg dbus
al@926 454 if [ -z $XAUTHORITY ]; then
al@926 455 stopd slim; sleep 2; startd slim
al@926 456 fi ;;
al@926 457
psychomaniak@912 458 wm_apps)
al@926 459 slitaz_apps_conf
al@926 460 apps_dialog ;;
al@926 461
pankso@840 462 *)
pankso@840 463 exit 0 ;;
pankso@66 464 esac
pankso@66 465 }
pankso@4 466
al@926 467
pankso@870 468 # ~/.config/slitaz/applications.conf: Missing = failed to login
pankso@876 469 # Make users applications.conf in /etc/skel so new added user will get
pankso@876 470 # a working X session. Note --> flavors can have a custom config in
pankso@876 471 # /etc/slitaz/applications that we must use.
al@926 472
pankso@870 473 slitaz_apps_conf() {
pankso@840 474 apps_conf=/etc/slitaz/applications.conf
al@926 475
pankso@876 476 if [ "$(id -u)" = 0 ]; then
al@926 477 user_conf=$apps_conf
psychomaniak@912 478 new_user_conf="/etc/skel/.config/slitaz/applications.conf"
al@926 479 mkdir -p $(dirname $new_user_conf)
al@926 480 cp -f $apps_conf $new_user_conf
pankso@876 481 else
pankso@876 482 # If started by: startx and with boot opts screen=text
al@926 483 user_conf="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf"
pankso@876 484 if [ ! -f "$user_conf" ]; then
al@926 485 mkdir -p $(dirname $user_conf)
al@926 486 cp $apps_conf $user_conf
pankso@876 487 fi
slaxemulator@538 488 fi
al@926 489
psychomaniak@918 490 [ -f "$HOME/.xinitrc" ] || inst_pkg slitaz-configs-base --forced
pankso@66 491 }
pankso@4 492
al@926 493
pankso@840 494 # Commands
pankso@66 495
pankso@351 496 case "$1" in
pankso@351 497 install-xorg)
pankso@840 498 check_root
pankso@351 499 install_xorg
pankso@870 500 slitaz_apps_conf ;;
al@926 501
pankso@415 502 config-xorg)
pankso@840 503 check_root
pankso@870 504 slitaz_apps_conf
pankso@840 505 xorg_conf_d
pankso@840 506 # Handle live option: screen=
pankso@870 507 if grep -qs 'screen=' /proc/cmdline ; then
pascal@564 508 MODE="$(sed 's/.*screen=\([0-9]*x[0-9]*\).*/\1/' < /proc/cmdline)"
pascal@564 509 sed -i "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \
pascal@564 510 /etc/X11/xorg.conf.d/70-Screen.conf
pascal@564 511 fi ;;
al@926 512
pankso@870 513 init)
paul@885 514 # We don't need much config files with last Xorg version, So just
paul@885 515 # get files for starting an X session and config the keyboard.
pankso@870 516 check_root
pankso@870 517 slitaz_apps_conf
al@926 518 keyboard_conf
pankso@871 519 gen_xorg_conf_file ;;
al@926 520
pankso@879 521 keyboard)
pankso@870 522 keyboard_conf ;;
al@926 523
psychomaniak@912 524 get-applist)
psychomaniak@912 525 slitaz_apps_conf
psychomaniak@912 526 gen_applist $2 $3 $4 ;;
al@926 527
psychomaniak@918 528 auto)
al@925 529 autoselect_driver ;;
al@926 530
psychomaniak@918 531 bpp)
psychomaniak@918 532 check_root
psychomaniak@918 533 xorg_conf_d
al@926 534 case "$2" in
al@926 535 8|15|16|24)
al@926 536 colors=$2 ;;
al@926 537 *)
al@926 538 exec 3>&1
al@926 539 colors=$($DIALOG --menu " " 12 12 12 \
al@926 540 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3)
al@926 541 dialog_end ;;
psychomaniak@918 542 esac
psychomaniak@920 543 sed 's|Monitor.*"$|&\n\tDefaultDepth '$colors'|' \
psychomaniak@920 544 -i ${xorg_config}/70-Screen.conf ;;
al@926 545
al@926 546 xkb)
al@926 547 xkb ;;
al@926 548
psychomaniak@918 549 *help)
al@926 550 emsg "
al@926 551 <b>tazx</b> - $(_ 'configuration tool for SliTaz GNU/Linux')
al@926 552
al@926 553 <c 33>$(_ 'Usage:')</c> <b>tazx</b> <c 34>$(_ 'command')</c> $(_ 'parameter')
al@926 554
al@926 555 <c 34>$(_ 'Commands:')</c>
al@926 556 install-xorg $(_ 'Install Xorg and selected Xorg driver')
al@926 557 config-xorg $(_ 'Configure Xorg, generate configuration files')
al@926 558 bpp $(_ 'Set monitor default depth (valid parameters: 8, 15, 16 or 24)')
al@926 559 auto $(_ 'Auto-select and install Xorg driver')
al@926 560 init $(_ 'Get files for starting an X session and config the keyboard')
al@926 561 keyboard $(_ 'Generate or regenerate Xorg keyboard config')
al@926 562 "
al@926 563 ;;
al@926 564
pankso@351 565 *)
pankso@615 566 # User can get a new .xinitrc with tazx from cmdline.
al@926 567 case $(id -u) in
al@926 568 0)
al@926 569 slitaz_apps_conf
al@926 570 config_dialog ;;
al@926 571 *)
al@926 572 msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn"
al@926 573 slitaz_apps_conf
al@926 574 apps_dialog ;;
al@926 575 esac
psychomaniak@912 576 # gen_xsession
psychomaniak@912 577 ;;
pankso@351 578 esac
pankso@4 579
pankso@4 580 exit 0