From b60b957d3a8821b7f1afb298e40809d58deb3c9c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 1 Aug 2002 21:25:55 +0000
Subject: - the old $o->{keyboard} is now $o->{keyboard}{KEYBOARD} - KBCHARSET
 is $o->{keyboard}{KBCHARSET} - isNotDelete is $o->{keyboard}{BACKSPACE} (as
 written in sysconfig/keyboard) - add GRP_TOGGLE which gives XkbOptions
 "grp:GRP_TOGGLE" - add dialog box to choose GRP_TOGGLE

---
 perl-install/Xconfig/default.pm | 1 +
 perl-install/Xconfig/parse.pm   | 2 +-
 perl-install/Xconfig/xfreeX.pm  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/Xconfig')

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;
-- 
cgit v1.2.1