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