summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-21 09:42:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-21 09:42:47 +0000
commit2fed2fdf2db71e0360248bf297003be0e531a4aa (patch)
treef6a159503999ce3132beb3a059c76a74c9817e8d /perl-install/standalone
parent55bdc695897f95ce1aa0be0ec7a5ea81c6bd2491 (diff)
downloaddrakx-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar
drakx-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.gz
drakx-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.bz2
drakx-2fed2fdf2db71e0360248bf297003be0e531a4aa.tar.xz
drakx-2fed2fdf2db71e0360248bf297003be0e531a4aa.zip
minimal XkbModel support
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/keyboarddrake9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index fbb46da7e..01de6bf50 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -20,6 +20,9 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
} else {
$in = 'interactive'->vnew('su');
+ my ($xkb_models, $model2text) = keyboard::xkb_models();
+ $keyboard->{XkbModel} ||= 'pc105';
+
choose:
$in->ask_from(N("Keyboard"),
N("Please, choose your keyboard layout."),
@@ -27,7 +30,11 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
format => sub { translate(keyboard::KEYBOARD2text($_[0])) },
list => [ keyboard::KEYBOARDs() ],
type => 'list',
- } ]) or goto end;
+ },
+ { val => \$keyboard->{XkbModel},
+ format => sub { $model2text->{$_[0]} },
+ list => $xkb_models },
+ ]) or goto end;
keyboard::group_toggle_choose($in, $keyboard) or goto choose;
}