diff options
Diffstat (limited to 'perl-install/standalone/keyboarddrake')
| -rwxr-xr-x | perl-install/standalone/keyboarddrake | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index 9bb77e6bb..b12a3f152 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -7,23 +7,24 @@ use interactive; use keyboard; use Xconfigurator_consts; use common qw(:system); +use c; local $_ = join '', @ARGV; -/-h/ and die "usage: keyboarddrake [--expert]\n"; +/-h/ and die _("usage: keyboarddrake [--expert]\n"); -$::expert = /--expert/; +$::expert = /-expert/; $::isStandalone = 1; -my $in = vnew interactive; +my $in = interactive->vnew('su'); -my $keyboard = keyboard::text2keyboard( - $in->ask_from_list_(_("Keyboard"), - _("What is your keyboard layout?"), - [ keyboard::list() ], - keyboard::keyboard2text(keyboard::read('')))); +my $keyboard = $in->ask_from_listf_(_("Keyboard"), + _("Please, choose your keyboard layout."), + \&keyboard::keyboard2text, + [ keyboard::xmodmaps() ], + keyboard::read()); -my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", "Do you want the BackSpace to return Delete in console?", 1); +my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1); my $kmap = keyboard::keyboard2kmap($keyboard); `loadkeys $kmap`; @@ -32,14 +33,24 @@ my $xkb = keyboard::keyboard2xkb($keyboard); `setxkbmap $xkb`; my $f = "/etc/X11/XF86Config"; +my $g = "/etc/X11/XF86Config-4"; + substInFile { - if (/^Section "Keyboard"/ .. /^EndSection/) { + if (/^Section\s+"Keyboard"/ .. /^EndSection/) { s|^(\s*XkbLayout\s+).*|$1"$xkb"| and $_ .= join '', map { " $_\n" } @{$xkb_options{$xkb} || []}; s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one } } $f if -e $f && !$::testing; +substInFile { + if (/Identifier\s+"Keyboard1"/ .. /^EndSection/) { + s|^(\s*Option\s+"XkbLayout"\s+).*|$1"$xkb"| + and $_ .= join '', map { /(\S+)(.*)/; qq( Option "$1" $2\n) } @{$xkb_options{$xkb} || []}; + s,^(\s*Option\s+"(XkbVariant|XkbOptions)"\s+).*,,; # remove existing one + } +} $g if -e $g && !$::testing; + keyboard::write('', $keyboard, $isNotDelete); -exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK +$in->exit(0); |