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