diff options
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/default.pm | 1 | ||||
| -rw-r--r-- | perl-install/Xconfig/parse.pm | 2 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfreeX.pm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index c33d084d8..b9072140e 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -63,6 +63,7 @@ sub config_keyboard { my $xkb = { $XkbLayout ? ( XkbLayout => $XkbLayout, XkbModel => $XkbModel, + if_($keyboard->{GRP_TOGGLE}, XkbOptions => "grp:$keyboard->{GRP_TOGGLE}"), ) : (XkbDisable => undef) }; $raw_X->set_keyboard($xkb); } diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm index 02daa3227..dbd8851ea 100644 --- a/perl-install/Xconfig/parse.pm +++ b/perl-install/Xconfig/parse.pm @@ -139,7 +139,7 @@ my %kind_names = ( InputDevice => [ qw(Identifier Driver Protocol Device Type Mode XkbModel XkbLayout XkbDisable Emulate3Buttons Emulate3Timeout) ], ServerLayout => [ qw(Identifier) ], ); -my @want_string = qw(Identifier DeviceName VendorName ModelName BoardName Driver Device Chipset Monitor Protocol XkbModel XkbLayout Load BusID); +my @want_string = qw(Identifier DeviceName VendorName ModelName BoardName Driver Device Chipset Monitor Protocol XkbModel XkbLayout XkbOptions Load BusID); %kind_names = map_each { lc $::a => [ map { lc } @$::b ] } %kind_names; @want_string = map { lc } @want_string; diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm index f6aa17f78..6154cb547 100644 --- a/perl-install/Xconfig/xfreeX.pm +++ b/perl-install/Xconfig/xfreeX.pm @@ -51,7 +51,7 @@ sub get_monitor { $l[0] } -my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable); +my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable XkbOptions); sub get_keyboard { my ($raw_X) = @_; my $raw_kbd = $raw_X->get_keyboard_section; |