diff options
| -rw-r--r-- | lib/Xconfig/monitor.pm | 2 | ||||
| -rw-r--r-- | lib/keyboard.pm | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm index 838d14f..d57e70b 100644 --- a/lib/Xconfig/monitor.pm +++ b/lib/Xconfig/monitor.pm @@ -79,7 +79,7 @@ sub configure_auto_install { } sub choose { - my ($in, $raw_X, $monitor, $head_nb, $b_auto) = @_; + my ($in, $_raw_X, $monitor, $head_nb, $b_auto) = @_; my $ok = is_valid($monitor); if ($b_auto && $ok) { diff --git a/lib/keyboard.pm b/lib/keyboard.pm index 5065611..2fe829d 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -597,28 +597,28 @@ sub write { setVarsInSh("$::prefix/etc/sysconfig/keyboard", $keyboard); - if ($keyboard->{'KEYTABLE'}) { - my $h2 = { 'KEYMAP' => $keyboard->{'KEYTABLE'} }; + if ($keyboard->{KEYTABLE}) { + my $h2 = { 'KEYMAP' => $keyboard->{KEYTABLE} }; addVarsInShMode("$::prefix/etc/vconsole.conf", 0644, $h2); } my $xorgconf = "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n" . "# manually too freely.\n" . - "Section \"InputClass\"\n" . - " Identifier \"system-keyboard\"\n" . - " MatchIsKeyboard \"on\"\n"; - my $isus = $keyboard->{'XkbLayout'} && $keyboard->{'XkbLayout'} eq "us"; - if ($keyboard->{'XkbLayout'} && !$isus) { - $xorgconf .= " Option \"XkbLayout\" \"" . $keyboard->{'XkbLayout'} . "\"\n"; + q(Section "InputClass"\n) . + qq( Identifier "system-keyboard"\n) . + q( MatchIsKeyboard "on"\n); + my $isus = $keyboard->{XkbLayout} && $keyboard->{XkbLayout} eq "us"; + if ($keyboard->{XkbLayout} && !$isus) { + $xorgconf .= " Option \"XkbLayout\" \"" . $keyboard->{XkbLayout} . "\"\n"; } - if ($keyboard->{'XkbModel'} && (!$isus || $keyboard->{'XkbModel'} ne "pc105")) { - $xorgconf .= " Option \"XkbModel\" \"" . $keyboard->{'XkbModel'} . "\"\n"; + if ($keyboard->{XkbModel} && (!$isus || $keyboard->{XkbModel} ne "pc105")) { + $xorgconf .= " Option \"XkbModel\" \"" . $keyboard->{XkbModel} . "\"\n"; } - if ($keyboard->{'XkbVariant'}) { - $xorgconf .= " Option \"XkbVariant\" \"" . $keyboard->{'XkbVariant'} . "\"\n"; + if ($keyboard->{XkbVariant}) { + $xorgconf .= " Option \"XkbVariant\" \"" . $keyboard->{XkbVariant} . "\"\n"; } - if ($keyboard->{'XkbOptions'}) { - $xorgconf .= " Option \"XkbOptions\" \"" . $keyboard->{'XkbOptions'} . "\"\n"; + if ($keyboard->{XkbOptions}) { + $xorgconf .= " Option \"XkbOptions\" \"" . $keyboard->{XkbOptions} . "\"\n"; } $xorgconf .= "EndSection\n"; output_p("$::prefix/etc/X11/xorg.conf.d/00-keyboard.conf", $xorgconf); |