slitaz-tools annotate tinyutils/tazx @ rev 870

tazx: update fo last Xorg
author Christophe Lincoln <pankso@slitaz.org>
date Wed Apr 30 20:04:24 2014 +0200 (2014-04-30)
parents 72c0e329d62f
children b1ce98240dff
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.
paul@835 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
pankso@840 21 installed="$PKGS_DB/installed"
pankso@840 22
al@813 23 export TEXTDOMAIN='slitaz-tools' #i18n
pankso@626 24 : ${DIALOG=dialog}
pankso@4 25
pankso@535 26 # Default value.
pankso@840 27 WM=${WINDOW_MANAGER}
pankso@351 28
pankso@534 29 # Default user for config files in Live mode, id is 1000 since it is
pankso@534 30 # created by /etc/init.d/bootopts.sh.
pankso@626 31 USER=$(cat /etc/passwd | grep 1000 | cut -d ":" -f 1)
pankso@4 32
pankso@628 33 #
pankso@615 34 # Functions
pankso@628 35 #
pankso@615 36
al@813 37 # Save chunk of xorg.conf into specified file
al@813 38 save_chunk() {
al@813 39 sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \
al@813 40 -e "s/EndSection/EndSection\n/" $xorg_template > \
al@813 41 $xorg_config/$1.conf
pankso@615 42 }
pankso@66 43
pankso@870 44 # Generate or regenerate 40-Keyboard.conf
pankso@870 45 keyboard_conf() {
gokhlayeh@492 46 # Configure the keyboard with the right keymap.
al@813 47 keymap=$(cat /etc/keymap.conf)
gokhlayeh@492 48 keyboard_config=$xorg_config/40-Keyboard.conf
al@779 49 variant=""
al@779 50 # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev)
al@779 51 options="terminate:ctrl_alt_bksp"
gokhlayeh@494 52 case $keymap in
pankso@260 53 fr_CH-latin1)
pankso@260 54 # Swiss FrenCH
al@779 55 layout="ch"; variant="fr" ;;
pankso@597 56 uk)
paul@617 57 # English UK
al@779 58 layout="gb" ;;
pankso@260 59 ru)
pankso@260 60 # Russian
al@779 61 layout="us,ru"
al@779 62 options="grp:ctrl_shift_toggle, grp_led:scroll, $options" ;;
al@813 63 ua)
al@813 64 # Ukrainian
al@813 65 layout="us,ua,ru"
al@813 66 options="grp:ctrl_shift_toggle, $options" ;;
pankso@303 67 slovene)
pankso@303 68 # Slovenian
al@779 69 layout="si"; options="grp:alt_shift_toggle, $options" ;;
pankso@577 70 us-acentos)
al@779 71 layout="us"; variant="intl" ;;
pankso@260 72 *)
pankso@260 73 # Use clean /etc/keymap.conf value.
gokhlayeh@492 74 keymap=${keymap%-latin1}
gokhlayeh@492 75 keymap=${keymap%-lat2}
gokhlayeh@492 76 keymap=${keymap%-lat6}
al@779 77 layout=${keymap%-abnt2}
pankso@260 78 esac
gokhlayeh@492 79
al@779 80 cat > $keyboard_config << EOC
al@779 81 Section "InputClass"
al@779 82 Identifier "Keyboard Defaults"
al@779 83 MatchIsKeyboard "yes"
al@779 84 Option "XkbLayout" "$layout"
al@779 85 Option "XkbVariant" "$variant"
al@779 86 Option "XkbOptions" "$options"
al@779 87 EndSection
al@779 88 EOC
al@813 89 [ x$variant == x ] && sed -i '/XkbVariant/d' $keyboard_config
pankso@870 90 }
pankso@870 91
pankso@870 92 # Populate xorg.conf.d.
pankso@870 93 xorg_conf_d() {
pankso@870 94 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d)
pankso@870 95 xorg_config=/etc/X11/xorg.conf.d
pankso@870 96
pankso@870 97 # Define the xorg.conf.new place.
pankso@870 98 xorg_template=/root/xorg.conf.new
pankso@870 99
pankso@870 100 # Obtain a default configuration file from Xorg.
pankso@870 101 Xorg -configure :2
pankso@870 102
pankso@870 103 # Backup existing config.
pankso@870 104 tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null
pankso@870 105
pankso@870 106 # Put the different sections in separate files in the config directory.
pankso@870 107 save_chunk 10-ServerLayout
pankso@870 108 sed -i '/Core/d' $xorg_config/10-ServerLayout.conf
pankso@870 109 save_chunk 20-Files
pankso@870 110 save_chunk 30-Module
pankso@870 111 save_chunk 50-Monitor
pankso@870 112 save_chunk 60-Device
pankso@870 113 save_chunk 70-Screen
pankso@870 114
pankso@870 115 # Remove the template.
pankso@870 116 rm $xorg_template
pankso@870 117
pankso@870 118 # Keyboard
pankso@870 119 keyboard_conf
gokhlayeh@492 120
gokhlayeh@492 121 # Create a xorg.conf if needed.
pankso@628 122 if [ ! -f /etc/X11/xorg.conf ]; then
pankso@628 123 cat > /etc/X11/xorg.conf << EOT
pankso@628 124 # You can put here your own Xorg configurations. This config file is read
pankso@628 125 # before all files in /etc/X11/xorg.conf.d and will NOT be erased by any
slaxemulator@645 126 # updates.
pankso@628 127 EOT
pankso@628 128 fi
pankso@260 129 }
pankso@260 130
paul@549 131 # Install xorg server.
al@813 132 install_xorg() {
pankso@628 133 [ -f "/var/lib/tazpkg/packages.list" ] || tazpkg recharge
pankso@117 134 exec 3>&1
al@813 135 value=$($DIALOG \
al@813 136 --clear --colors \
al@813 137 --title " $(_n 'Install Xorg') " \
al@813 138 --menu "$(_n 'Tazx helps you to select your X driver.')" 16 70 8 \
pankso@635 139 $(fgrep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | \
al@813 140 while read x; do echo $x; _ 'driver'; done) \
al@813 141 "quit" "$(_n 'Quit')" \
al@813 142 2>&1 1>&3)
pankso@117 143 retval=$?
pankso@117 144 exec 3>&-
al@813 145
pankso@628 146 # Continue or exit.
pankso@117 147 case $retval in
pankso@628 148 0) continue ;;
pankso@628 149 1|255) exit 0 ;;
pankso@117 150 esac
al@813 151
pankso@117 152 # Set selected value.
pankso@117 153 case $value in
pankso@628 154 quit) exit 0 ;;
pankso@117 155 *)
pankso@840 156 [ -d "$installed/xorg-server" ] || tazpkg -gi xorg-server
pankso@628 157 [ -d "$installed/xorg-xf86-video-$value" ] || \
pankso@840 158 tazpkg -gi xorg-xf86-video-$value
pankso@628 159 xorg_conf_d ;;
pankso@117 160 esac
pankso@117 161 }
pankso@117 162
pankso@628 163 # Screen configuration dialog. TODO: menus items to enable/disable X on boot
pankso@628 164 # and sed /etc/rcS.conf to remove slim from RUN_DAEMONS.
al@813 165 config_dialog() {
pankso@66 166 exec 3>&1
al@813 167 value=$($DIALOG \
pankso@535 168 --clear --colors \
pankso@840 169 --title "{ $(_n 'SliTaz Xorg config') }" \
pankso@840 170 --menu "" 16 72 10 \
pankso@840 171 "xorg" "$(_n 'Install or reconfigure Xorg')" \
pankso@840 172 "xorg-light" "$(_n 'Install Xorg server (light version)')" \
pankso@840 173 "quit" "$(_n 'Quit Tazx utility')" \
al@813 174 2>&1 1>&3)
pankso@66 175 retval=$?
pankso@66 176 exec 3>&-
al@813 177
pankso@628 178 # Continue or exit.
pankso@66 179 case $retval in
pankso@628 180 0) continue ;;
pankso@628 181 1|255) exit 0 ;;
pankso@66 182 esac
al@813 183
pankso@66 184 # Set selected value.
pankso@840 185 case "$value" in
pankso@840 186 xorg)
pankso@339 187 install_xorg ;;
pankso@840 188 xorg-light)
pankso@840 189 [ -d "$installed/xorg-server-light" ] || \
pankso@840 190 tazpkg -gi xorg-server-light
pankso@840 191 [ -d "$installed/xorg-xf86-video-fbdev" ] || \
pankso@840 192 tazpkg -gi xorg-xf86-video-fbdev
pankso@840 193 xorg_conf_d ;;
pankso@840 194 *)
pankso@840 195 exit 0 ;;
pankso@66 196 esac
pankso@66 197 }
pankso@4 198
pankso@870 199 # ~/.config/slitaz/applications.conf: Missing = failed to login
pankso@870 200 slitaz_apps_conf() {
pankso@840 201 apps_conf=/etc/slitaz/applications.conf
pankso@840 202 user_conf="$HOME/.config/slitaz/applications.conf"
al@813 203
pankso@870 204 # Make users applications.conf in /etc/skel so new added user will get
pankso@535 205 # a working X session.
pankso@535 206 if test $(id -u) = 0; then
pankso@840 207 user_conf="/etc/skel/.config/slitaz/applications.conf"
pankso@840 208 mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${user_conf}
pankso@535 209 fi
pankso@870 210
pankso@870 211 # If started by: startx and with boot opts screen=text
pankso@840 212 if [ ! -f "$user_conf" ]; then
pankso@840 213 mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf}
slaxemulator@538 214 fi
pankso@66 215 }
pankso@4 216
pankso@840 217 # Commands
pankso@66 218
pankso@351 219 case "$1" in
pankso@351 220 install-xorg)
pankso@840 221 check_root
pankso@351 222 install_xorg
pankso@870 223 slitaz_apps_conf ;;
pankso@840 224
pankso@415 225 config-xorg)
pankso@840 226 check_root
pankso@870 227 slitaz_apps_conf
pankso@840 228 xorg_conf_d
pankso@840 229 # Handle live option: screen=
pankso@870 230 if grep -qs 'screen=' /proc/cmdline ; then
pascal@564 231 MODE="$(sed 's/.*screen=\([0-9]*x[0-9]*\).*/\1/' < /proc/cmdline)"
pascal@564 232 sed -i "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \
pascal@564 233 /etc/X11/xorg.conf.d/70-Screen.conf
pascal@564 234 fi ;;
pankso@840 235
pankso@870 236 init)
pankso@870 237 # We dont need much config files with last Xorg verrsion, So just
pankso@870 238 # gest files for start a X session and config the keyboard.
pankso@870 239 check_root
pankso@870 240 slitaz_apps_conf
pankso@870 241 keyboard_conf ;;
pankso@870 242
pankso@870 243 keybard)
pankso@870 244 echo "Generating: 40-Keyboard.conf"
pankso@870 245 keyboard_conf ;;
pankso@870 246
pankso@840 247 *help)
pankso@870 248 echo "Usage: $(basename $0) [install-xorg|config-xorg|init|keyboard]" ;;
pankso@840 249
pankso@351 250 *)
pankso@615 251 # User can get a new .xinitrc with tazx from cmdline.
pankso@840 252 [ $(id -u) == 0 ] && config_dialog
pankso@870 253 slitaz_apps_conf
pankso@870 254 gen_xsession ;;
pankso@351 255 esac
pankso@4 256
pankso@4 257 exit 0