slitaz-tools annotate tinyutils/tazx @ rev 948

tazx: fix Xorg keyboard layouts (thanks kubepc)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jul 31 17:21:47 2015 +0300 (2015-07-31)
parents 3b8de2d6aeb3
children 33bac140fd6d
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 #
al@939 7 # (c) 2011-2015 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
al@813 20 export TEXTDOMAIN='slitaz-tools' #i18n
pascal@916 21 : ${DIALOG=dialog --timeout 60}
pankso@4 22
al@939 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
al@948 144 # Reference: syslinux receipt; LXPanel keyboard layout switcher
pankso@874 145 case "$keymap" in
al@948 146 # Swiss FrenCH
al@948 147 fr_CH-latin1) layout='ch'; variant='fr' ;;
al@948 148 # English UK
al@948 149 uk) layout='gb' ;;
al@948 150 # Greek
al@948 151 gr) layout='us,gr'
al@946 152 options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;;
al@948 153 # Russian
al@948 154 ru) layout='us,ru'
al@926 155 options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;;
al@948 156 # Ukrainian
al@948 157 ua) layout='us,ua,ru'
al@926 158 options="grp:ctrl_shift_toggle, compose:ralt, $options" ;;
al@948 159 # Slovenian
al@948 160 slovene) layout='si' ;;
al@948 161 # Brasil (us-acentos); English US (acentos)
al@948 162 us-acentos) layout='us'; variant='intl' ;;
al@948 163 # Deutsch Schweiz
al@948 164 de_CH-latin1) layout='ch' ;;
al@948 165 # Deutsch Schweiz (sg) in syslinux menu
al@948 166 sg-latin1)
al@948 167 # I can't guess appropriate layout for this one
al@948 168 ;;
al@948 169 # Dvorak
al@948 170 dvorak) layout='us'; variant='dvorak' ;;
al@948 171 dvorak-l) layout='us'; variant='dvorak-l' ;;
al@948 172 dvorak-r) layout='us'; variant='dvorak-r' ;;
al@948 173 # French (Canada)
al@948 174 cf) layout='ca' ;;
al@948 175 # Croatian
al@948 176 hr,croat|croat) layout='hr' ;;
al@948 177 # Japanese
al@948 178 jp106) layout='jp' ;; # is ok?
al@948 179 # Dutch
al@948 180 nl2) layout='nl' ;;
al@948 181 # Polish
al@948 182 pl2) layout='pl' ;;
al@948 183 # Turkish
al@948 184 trq) layout='tr' ;;
al@948 185 tr_q-latin5) layout='tr'; variant='ku' ;; # is ok?
pankso@260 186 *)
pankso@260 187 # Use clean /etc/keymap.conf value.
gokhlayeh@492 188 keymap=${keymap%-latin1}
gokhlayeh@492 189 keymap=${keymap%-lat2}
gokhlayeh@492 190 keymap=${keymap%-lat6}
al@779 191 layout=${keymap%-abnt2}
pankso@260 192 esac
al@926 193
al@779 194 cat > $keyboard_config << EOC
al@779 195 Section "InputClass"
al@779 196 Identifier "Keyboard Defaults"
al@779 197 MatchIsKeyboard "yes"
al@779 198 Option "XkbLayout" "$layout"
al@779 199 Option "XkbVariant" "$variant"
al@779 200 Option "XkbOptions" "$options"
al@779 201 EndSection
al@779 202 EOC
al@926 203
pankso@874 204 status
al@926 205 [ -z "$variant" ] && sed -i '/XkbVariant/d' $keyboard_config
psychomaniak@932 206 [ -z $(busybox which lxpanel) ] || xkb
pankso@870 207 }
pankso@870 208
al@926 209
al@926 210 # Populate xorg.conf.d
al@926 211
pankso@870 212 xorg_conf_d() {
pankso@870 213 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d)
pankso@870 214 xorg_config=/etc/X11/xorg.conf.d
pankso@870 215
pankso@870 216 # Define the xorg.conf.new place.
pankso@870 217 xorg_template=/root/xorg.conf.new
pankso@870 218
pankso@870 219 # Obtain a default configuration file from Xorg.
pankso@870 220 Xorg -configure :2
pankso@870 221
pankso@870 222 # Backup existing config.
al@926 223 tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null
pankso@870 224
pankso@870 225 # Put the different sections in separate files in the config directory.
pankso@870 226 save_chunk 10-ServerLayout
pankso@870 227 sed -i '/Core/d' $xorg_config/10-ServerLayout.conf
pankso@870 228 save_chunk 20-Files
pankso@870 229 save_chunk 30-Module
pankso@870 230 save_chunk 50-Monitor
pankso@870 231 save_chunk 60-Device
pankso@870 232 save_chunk 70-Screen
pankso@870 233
pankso@870 234 # Remove the template.
pankso@870 235 rm $xorg_template
pankso@870 236
pankso@871 237 # Keyboard & xorg.conf
pankso@870 238 keyboard_conf
pankso@871 239 gen_xorg_conf_file
pankso@260 240 }
pankso@260 241
al@926 242
al@926 243 # Process dialog's return code.
al@926 244
psychomaniak@912 245 dialog_end() {
psychomaniak@912 246 retval=$?
psychomaniak@912 247 exec 3>&-
psychomaniak@912 248 # Continue or exit.
psychomaniak@912 249 case $retval in
al@926 250 0|3) continue ;;
al@926 251 1|255) exit 0 ;;
psychomaniak@912 252 esac
psychomaniak@912 253 }
psychomaniak@912 254
al@926 255
paul@549 256 # Install xorg server.
al@926 257
al@813 258 install_xorg() {
al@926 259 [ -f "$PKGS_DB/packages.list" ] || tazpkg recharge
al@926 260
pankso@117 261 exec 3>&1
al@926 262
al@926 263 driver=$($DIALOG \
al@926 264 --clear --colors --scrollbar --title " $(_ 'Install Xorg') " \
al@926 265 --menu "$(_ 'Tazx helps you to select your X driver.')" 16 70 9 \
al@926 266 'auto' "$(_ 'Auto configuring')" \
al@926 267 $(fgrep xorg-xf86-video- $PKGS_DB/packages.list | cut -d- -f4 | \
al@926 268 sed "s|.*|& $(_ 'driver')|") \
al@926 269 'quit' "$(_ 'Quit')" \
al@926 270 2>&1 1>&3)
al@926 271
psychomaniak@912 272 dialog_end
al@813 273
al@926 274 case $driver in
pankso@628 275 quit) exit 0 ;;
al@926 276 auto) autoselect_driver ;;
pankso@117 277 *)
psychomaniak@912 278 inst_pkg xorg-server
al@926 279 inst_pkg xorg-xf86-video-$driver
pankso@628 280 xorg_conf_d ;;
pankso@117 281 esac
pankso@117 282 }
pankso@117 283
al@925 284
al@926 285 # Auto-select and install Xorg driver.
al@926 286
psychomaniak@918 287 autoselect_driver() {
al@925 288 inst_pkg xorg-server
al@925 289
al@924 290 for VID in $(busybox lspci | grep 'Class 03' | cut -c21-24 | sort -u); do
al@924 291 case $VID in
al@924 292 1022|1002) d=ati ;;
al@924 293 8086) d=intel ;;
al@924 294 10de) d=nouveau ;;
al@924 295 1039) d=sis ;;
al@924 296 15ad) d=vmware ;;
al@925 297 *) d=''; $DIALOG --colors --msgbox \
al@926 298 "\n\Z1$(_n 'Failed to setup driver')\Zn $(_ '(unknown hardware)')" 7 68 ;;
al@924 299 esac
al@925 300 [ -n "$d" ] && inst_pkg xorg-xf86-video-$d
al@924 301 done
psychomaniak@918 302 }
psychomaniak@918 303
al@926 304
al@926 305 # Install specified package.
al@926 306
psychomaniak@912 307 inst_pkg() {
al@926 308 pkg="$@"
al@943 309 colorize 3 $(_ 'Installing pkg: %s' "$pkg")
al@926 310
al@926 311 case $(id -u) in
al@926 312 0) CMD="tazpkg -gi $@" ;;
al@926 313 *) CMD="sudo tazpkg -gi $@" ;;
al@926 314 esac
al@926 315 [ -d "$INSTALLED/$@" ] || $CMD
psychomaniak@909 316 }
psychomaniak@909 317
al@926 318
al@926 319 # Select/install Window Manager and favorite applications.
al@926 320
psychomaniak@912 321 apps_dialog() {
psychomaniak@931 322 slitaz_apps_conf
al@926 323 . $user_conf
al@926 324
psychomaniak@912 325 exec 3>&1
al@926 326
psychomaniak@918 327 app=$($DIALOG --clear --colors --backtitle "$msg" \
al@926 328 --title "{\Z3 $(_n 'Install Window Manager and applications') \Zn}" \
psychomaniak@918 329 --inputmenu "" 21 52 18 \
al@926 330 $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do
al@926 331 eval n='$'$a; echo $a $n;
al@926 332 done) 2>&1 1>&3)
psychomaniak@912 333 dialog_end
al@926 334
psychomaniak@912 335 case $app in
psychomaniak@935 336 RENAMED*) # like: RENAMED EDITOR myeditor
al@926 337 appname=$(echo $app | cut -d" " -f3)
al@926 338 app=$(echo $app | cut -d" " -f2) ;;
psychomaniak@912 339 *)
al@926 340 app_name_dialog only-installed ;;
psychomaniak@912 341 esac
al@926 342
al@943 343 if [ "$appname" != " " ]; then
al@943 344 if [ "$appname" == 'show_ALL' ]; then
al@926 345 app_name_dialog full-list
psychomaniak@931 346 inst_pkg $appname
psychomaniak@912 347 fi
al@926 348 if [ -z $(busybox which $appname) ]; then
psychomaniak@935 349 inst_pkg $appname
al@926 350 inst_pkg $(lzcat $PKGS_DB/files.list.lzma | fgrep /bin/$appname | head -n1 | cut -d: -f1)
al@926 351 fi
psychomaniak@931 352 sed -i "/$app/ s|=.*$|=\"$appname\"|" $user_conf
psychomaniak@912 353 fi
al@926 354
al@926 355 msg=''; apps_dialog # loop
psychomaniak@912 356 }
psychomaniak@912 357
al@926 358
al@926 359 # Show list of applications to choose.
al@926 360
psychomaniak@912 361 app_name_dialog() {
al@926 362 case $1 in
al@943 363 full-list) height='24' ;;
al@943 364 *) height='18' ;;
al@926 365 esac
al@926 366
psychomaniak@912 367 exec 3>&1
al@926 368
al@926 369 appname=$($DIALOG --clear --colors --title "$app" \
al@926 370 --menu '' $height 50 24 $(gen_applist $app $@) 2>&1 1>&3)
psychomaniak@912 371 dialog_end
psychomaniak@912 372 }
psychomaniak@912 373
al@926 374
al@926 375 # Generate application list for Dialog or Yad.
al@926 376
psychomaniak@912 377 gen_applist() {
al@926 378 # $1 = [ FILE_MANAGER | BROWSER | EDITOR | TERMINAL | WINDOW_MANAGER ]
al@926 379 # $2 = [ only-installed | full-list ]
al@926 380 # $3 = [ yad | * ]
al@926 381
al@926 382 . $user_conf
al@926 383
al@926 384 FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger \
al@926 385 spacefm thunar xfe ytree"
al@926 386
al@926 387 BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \
al@943 388 links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb \
al@943 389 w3m xombrero"
al@926 390
psychomaniak@931 391 EDITORS="adie beaver bluefish emacs geany jed joe juffed ht le leafpad \
psychomaniak@931 392 mcedit mousepad mp-5 nano qedit SciTE tea vi vim xedit xfw zile"
al@926 393
al@926 394 TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda \
psychomaniak@931 395 urxvt vte xfce4-terminal xterm yeahconsole"
al@926 396
al@926 397 WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox \
al@926 398 icewm jwm lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison \
al@926 399 xfwm4"
psychomaniak@912 400
psychomaniak@912 401 eval list='$'"$1"S
psychomaniak@912 402 eval current='$'"$1"
al@926 403
al@926 404 for i in $current $(echo " $list " | sed "s| $current | |g"); do
al@926 405
al@926 406 case $(busybox which $i) in
al@926 407 '') # not installed
al@926 408 t='---' ;;
al@926 409 *) # installed
al@926 410 t='<--' ;;
al@926 411 esac
al@926 412
al@926 413 if [ "$2" == 'full-list' ] || [ "$t" == '<--' ]; then
al@926 414 echo "$i"
al@926 415
al@926 416 if [ "$3" != 'yad' ]; then
al@926 417 echo "$(echo $t | sed "s|---|$(_n 'Install')|g")"
al@926 418 fi
al@926 419 fi
al@926 420 done
al@926 421
al@926 422 if [ "$2" == 'only-installed' ] && [ "$3" != 'yad' ]; then
al@926 423 echo 'show_ALL' "+$(_n 'Install')"
psychomaniak@912 424 fi
psychomaniak@912 425 }
psychomaniak@912 426
al@926 427
psychomaniak@912 428 # Screen configuration dialog.
al@926 429
al@813 430 config_dialog() {
al@926 431 . /etc/rcS.conf
al@926 432 case $LOGIN_MANAGER in
al@926 433 slim) LM="$(_ 'ON')" ;;
al@926 434 *) LM="$(_ 'OFF')" ;;
al@926 435 esac
psychomaniak@909 436
pankso@66 437 exec 3>&1
al@926 438
al@813 439 value=$($DIALOG \
pankso@535 440 --clear --colors \
pankso@840 441 --title "{ $(_n 'SliTaz Xorg config') }" \
pankso@840 442 --menu "" 16 72 10 \
pankso@840 443 "xorg" "$(_n 'Install or reconfigure Xorg')" \
pankso@840 444 "xorg-light" "$(_n 'Install Xorg server (light version)')" \
al@926 445 "onboot" "$(_n 'AutoStart Xorg by SLiM on boot'): \Z5$LM\Zn" \
psychomaniak@909 446 "slim" "$(_n '(Re)Start Simple Login Manager now')" \
al@926 447 "wm_apps" "$(_n 'Install Window Manager and applications')" \
pankso@840 448 "quit" "$(_n 'Quit Tazx utility')" \
al@813 449 2>&1 1>&3)
psychomaniak@912 450 dialog_end
al@926 451
pankso@840 452 case "$value" in
psychomaniak@912 453 xorg)
pankso@339 454 install_xorg ;;
al@926 455
pankso@840 456 xorg-light)
psychomaniak@912 457 inst_pkg xorg-server-light
psychomaniak@912 458 inst_pkg xorg-xf86-video-fbdev
pankso@840 459 xorg_conf_d ;;
al@926 460
psychomaniak@909 461 onboot)
al@926 462 inst_pkg slim
al@926 463 inst_pkg dbus
al@926 464
al@926 465 if [ $LM == "$(_ 'OFF')" ]; then
al@926 466 LM='slim'
al@926 467 else
al@926 468 LM=''
psychomaniak@909 469 fi
al@926 470 sed -i "/LOGIN_MANAGER/ s|=.*$|=$LM|" /etc/rcS.conf
al@926 471
al@926 472 [ -z "$LM" ] && LM='disabled'
al@926 473 _n "Start X on boot:"; boldify " $LM" ;;
al@926 474
psychomaniak@909 475 slim)
al@926 476 inst_pkg slim
al@926 477 inst_pkg dbus
al@926 478 if [ -z $XAUTHORITY ]; then
al@926 479 stopd slim; sleep 2; startd slim
al@926 480 fi ;;
al@926 481
psychomaniak@912 482 wm_apps)
al@926 483 apps_dialog ;;
al@926 484
pankso@840 485 *)
pankso@840 486 exit 0 ;;
pankso@66 487 esac
pankso@66 488 }
pankso@4 489
al@926 490
pankso@870 491 # ~/.config/slitaz/applications.conf: Missing = failed to login
pankso@876 492 # Make users applications.conf in /etc/skel so new added user will get
pankso@876 493 # a working X session. Note --> flavors can have a custom config in
pankso@876 494 # /etc/slitaz/applications that we must use.
al@926 495
pankso@870 496 slitaz_apps_conf() {
pankso@840 497 apps_conf=/etc/slitaz/applications.conf
al@926 498
psychomaniak@933 499 [ -f $apps_conf ] || inst_pkg slitaz-configs --forced
psychomaniak@933 500
al@943 501 if [ "$(id -u)" -eq 0 ]; then
al@943 502 user_conf="$apps_conf"
al@943 503 new_user_conf='/etc/skel/.config/slitaz/applications.conf'
al@926 504 mkdir -p $(dirname $new_user_conf)
al@926 505 cp -f $apps_conf $new_user_conf
pankso@876 506 else
pankso@876 507 # If started by: startx and with boot opts screen=text
al@926 508 user_conf="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf"
pankso@876 509 if [ ! -f "$user_conf" ]; then
al@926 510 mkdir -p $(dirname $user_conf)
al@926 511 cp $apps_conf $user_conf
pankso@876 512 fi
slaxemulator@538 513 fi
psychomaniak@918 514 [ -f "$HOME/.xinitrc" ] || inst_pkg slitaz-configs-base --forced
pankso@66 515 }
pankso@4 516
al@926 517
psychomaniak@933 518 # Handle live options: screen= video=
al@939 519
psychomaniak@933 520 proc_cmdline()
psychomaniak@933 521 {
psychomaniak@933 522 if grep -qs 'screen=' /proc/cmdline ; then
psychomaniak@933 523 MODE="$(sed 's/.*screen=\([0-9]*x[0-9]*\).*/\1/' < /proc/cmdline)"
psychomaniak@933 524 sed "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \
psychomaniak@933 525 -i ${xorg_config}/70-Screen.conf
psychomaniak@933 526 elif grep -qs 'video=' /proc/cmdline ; then
psychomaniak@933 527 MODE="$(sed 's/.*video=\([0-9]*x[0-9]*\).*/\1/' < /proc/cmdline)"
psychomaniak@933 528 DEPTH=$(sed 's/.*video=.*-\([0-9]*\).*/\1/' < /proc/cmdline)
psychomaniak@933 529 sed "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \
psychomaniak@933 530 -i ${xorg_config}/70-Screen.conf
psychomaniak@933 531 set_depth $DEPTH
psychomaniak@933 532 fi
psychomaniak@933 533 }
psychomaniak@933 534
al@939 535
psychomaniak@933 536 set_depth()
psychomaniak@933 537 {
psychomaniak@933 538 case "$1" in
psychomaniak@935 539 8|15|16|24|32) colors=$1 ;;
psychomaniak@933 540 *)
psychomaniak@933 541 exec 3>&1
psychomaniak@933 542 colors=$($DIALOG --menu " " 12 12 12 \
psychomaniak@935 543 32 truecolor 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3)
psychomaniak@933 544 dialog_end ;;
psychomaniak@933 545 esac
psychomaniak@933 546 sed 's|Monitor.*"$|&\n\tDefaultDepth '$colors'|' -i ${xorg_config}/70-Screen.conf
psychomaniak@933 547 }
psychomaniak@933 548
psychomaniak@933 549
psychomaniak@933 550
pankso@840 551 # Commands
pankso@66 552
pankso@351 553 case "$1" in
pankso@351 554 install-xorg)
pankso@840 555 check_root
pankso@351 556 install_xorg
pankso@870 557 slitaz_apps_conf ;;
al@926 558
pankso@415 559 config-xorg)
pankso@840 560 check_root
pankso@870 561 slitaz_apps_conf
pankso@840 562 xorg_conf_d
psychomaniak@933 563 proc_cmdline ;;
al@926 564
pankso@870 565 init)
paul@885 566 # We don't need much config files with last Xorg version, So just
paul@885 567 # get files for starting an X session and config the keyboard.
pankso@870 568 check_root
psychomaniak@933 569 slitaz_apps_conf
al@926 570 keyboard_conf
pankso@871 571 gen_xorg_conf_file ;;
al@926 572
pankso@879 573 keyboard)
pankso@870 574 keyboard_conf ;;
al@926 575
psychomaniak@912 576 get-applist)
psychomaniak@912 577 slitaz_apps_conf
psychomaniak@912 578 gen_applist $2 $3 $4 ;;
al@926 579
psychomaniak@918 580 auto)
al@925 581 autoselect_driver ;;
al@926 582
psychomaniak@918 583 bpp)
psychomaniak@918 584 check_root
psychomaniak@918 585 xorg_conf_d
psychomaniak@935 586 proc_cmdline
psychomaniak@933 587 set_depth $2 ;;
al@926 588
al@926 589 xkb)
al@926 590 xkb ;;
al@926 591
psychomaniak@935 592
psychomaniak@933 593 *help|-h|-?)
al@926 594 emsg "
paul@929 595 <b>tazx</b> - $(_ 'Configuration tool for SliTaz GNU/Linux')
al@926 596
al@926 597 <c 33>$(_ 'Usage:')</c> <b>tazx</b> <c 34>$(_ 'command')</c> $(_ 'parameter')
al@926 598
al@926 599 <c 34>$(_ 'Commands:')</c>
al@926 600 install-xorg $(_ 'Install Xorg and selected Xorg driver')
al@926 601 config-xorg $(_ 'Configure Xorg, generate configuration files')
al@926 602 bpp $(_ 'Set monitor default depth (valid parameters: 8, 15, 16 or 24)')
al@926 603 auto $(_ 'Auto-select and install Xorg driver')
al@926 604 init $(_ 'Get files for starting an X session and config the keyboard')
al@926 605 keyboard $(_ 'Generate or regenerate Xorg keyboard config')
al@926 606 "
al@926 607 ;;
al@926 608
pankso@351 609 *)
pankso@615 610 # User can get a new .xinitrc with tazx from cmdline.
al@926 611 case $(id -u) in
al@926 612 0)
al@926 613 config_dialog ;;
al@926 614 *)
al@926 615 msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn"
al@926 616 apps_dialog ;;
al@926 617 esac
psychomaniak@912 618 # gen_xsession
psychomaniak@912 619 ;;
pankso@351 620 esac
pankso@4 621
pankso@4 622 exit 0