diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-21 09:42:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-21 09:42:47 +0000 |
| commit | 2fed2fdf2db71e0360248bf297003be0e531a4aa (patch) | |
| tree | f6a159503999ce3132beb3a059c76a74c9817e8d /perl-install/keyboard.pm | |
| parent | 55bdc695897f95ce1aa0be0ec7a5ea81c6bd2491 (diff) | |
| download | drakx-backup-do-not-use-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar drakx-backup-do-not-use-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.gz drakx-backup-do-not-use-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.bz2 drakx-backup-do-not-use-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.xz drakx-backup-do-not-use-2fed2fdf2db71e0360248bf297003be0e531a4aa.zip | |
minimal XkbModel support
Diffstat (limited to 'perl-install/keyboard.pm')
| -rw-r--r-- | perl-install/keyboard.pm | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index b2df6a549..104cf11dd 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -365,6 +365,11 @@ sub keyboard2text { keyboard2one($_[0], 0) } sub keyboard2kmap { keyboard2one($_[0], 1) } sub keyboard2xkb { keyboard2one($_[0], 2) } +sub xkb_models() { + my $models = parse_xkb_rules()->{model}; + [ map { $_->[0] } @$models ], { map { @$_ } @$models }; +} + sub grp_toggles { my ($keyboard) = @_; keyboard2one($keyboard, 3) or return; @@ -482,15 +487,33 @@ sub load { } @$tables_given; } +sub parse_xkb_rules() { + my $cat; + my %l; + my $lst_file = "$::prefix/usr/X11R6/lib/X11/xkb/rules/xorg.lst"; + foreach (cat_($lst_file)) { + next if m!^\s*//! || m!^\s*$!; + chomp; + if (/^\!\s*(\S+)$/) { + $cat = $1; + } elsif (/^\s*(\w\S*)\s+(.*)/) { + push @{$l{$cat}}, [ $1, $2 ]; + } else { + log::l("parse_xkb_rules:$lst_file: bad line $_"); + } + } + \%l; +} + sub keyboard2full_xkb { my ($keyboard) = @_; my $XkbLayout = keyboard2xkb($keyboard) or return { XkbDisable => '' }; - my $XkbModel = - arch() =~ /sparc/ ? 'sun' : + my $XkbModel = $keyboard->{XkbModel} || + (arch() =~ /sparc/ ? 'sun' : $XkbLayout eq 'jp' ? 'jp106' : - $XkbLayout eq 'br' ? 'abnt2' : 'pc105'; + $XkbLayout eq 'br' ? 'abnt2' : 'pc105'); { XkbLayout => |