slitaz-tools 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 bbe5970f4d78
children c0133aefef14
files tinyutils/tazx
line diff
     1.1 --- a/tinyutils/tazx	Sat Jul 25 22:52:48 2015 +0200
     1.2 +++ b/tinyutils/tazx	Fri Jul 31 17:21:47 2015 +0300
     1.3 @@ -141,30 +141,48 @@
     1.4  	_n 'Creating:'; echo -n " $keyboard_config"
     1.5  	mkdir -p $(dirname $keyboard_config)
     1.6  
     1.7 +	# Reference: syslinux receipt; LXPanel keyboard layout switcher
     1.8  	case "$keymap" in
     1.9 -		fr_CH-latin1)
    1.10 -			# Swiss FrenCH
    1.11 -			layout="ch"; variant="fr" ;;
    1.12 -		uk)
    1.13 -			# English UK
    1.14 -			layout="gb" ;;
    1.15 -		gr)
    1.16 -			# Greek
    1.17 -			layout="us,gr"
    1.18 +		# Swiss FrenCH
    1.19 +		fr_CH-latin1)	layout='ch'; variant='fr' ;;
    1.20 +		# English UK
    1.21 +		uk)				layout='gb' ;;
    1.22 +		# Greek
    1.23 +		gr)				layout='us,gr'
    1.24  			options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;;
    1.25 -		ru)
    1.26 -			# Russian
    1.27 -			layout="us,ru"
    1.28 +		# Russian
    1.29 +		ru)				layout='us,ru'
    1.30  			options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;;
    1.31 -		ua)
    1.32 -			# Ukrainian
    1.33 -			layout="us,ua,ru"
    1.34 +		# Ukrainian
    1.35 +		ua)				layout='us,ua,ru'
    1.36  			options="grp:ctrl_shift_toggle, compose:ralt, $options" ;;
    1.37 -		slovene)
    1.38 -			# Slovenian
    1.39 -			layout="si"; options="grp:alt_shift_toggle, $options" ;;
    1.40 -		us-acentos)
    1.41 -			layout="us"; variant="intl" ;;
    1.42 +		# Slovenian
    1.43 +		slovene)		layout='si' ;;
    1.44 +		# Brasil (us-acentos); English US (acentos)
    1.45 +		us-acentos)		layout='us'; variant='intl' ;;
    1.46 +		# Deutsch Schweiz
    1.47 +		de_CH-latin1)	layout='ch' ;;
    1.48 +		# Deutsch Schweiz (sg) in syslinux menu
    1.49 +		sg-latin1)
    1.50 +			# I can't guess appropriate layout for this one
    1.51 +			;;
    1.52 +		# Dvorak
    1.53 +		dvorak)			layout='us'; variant='dvorak'   ;;
    1.54 +		dvorak-l)		layout='us'; variant='dvorak-l' ;;
    1.55 +		dvorak-r)		layout='us'; variant='dvorak-r' ;;
    1.56 +		# French (Canada)
    1.57 +		cf)				layout='ca' ;;
    1.58 +		# Croatian
    1.59 +		hr,croat|croat)	layout='hr' ;;
    1.60 +		# Japanese
    1.61 +		jp106)			layout='jp' ;; # is ok?
    1.62 +		# Dutch
    1.63 +		nl2)			layout='nl' ;;
    1.64 +		# Polish
    1.65 +		pl2)			layout='pl' ;;
    1.66 +		# Turkish
    1.67 +		trq)			layout='tr' ;;
    1.68 +		tr_q-latin5)	layout='tr'; variant='ku' ;; # is ok?
    1.69  		*)
    1.70  			# Use clean /etc/keymap.conf value.
    1.71  			keymap=${keymap%-latin1}