From c9f86c7e305b54214444ad538fef1dbd98648f5a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 23 Mar 2004 10:07:12 +0000
Subject: - az, tr and tr_f needs XkbOptions 'caps:shift' - cleanup

---
 perl-install/keyboard.pm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'perl-install/keyboard.pm')

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 181877d39..7f3d90edd 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -414,22 +414,23 @@ sub load {
 sub keyboard2full_xkb {
     my ($keyboard) = @_;
 
-    my $XkbLayout = keyboard2xkb($keyboard);
+    my $XkbLayout = keyboard2xkb($keyboard) or return { XkbDisable => '' };
 
     my $XkbModel = 
       arch() =~ /sparc/ ? 'sun' :
 	$XkbLayout eq 'jp' ? 'jp106' : 
 	$XkbLayout eq 'br' ? 'abnt2' : 'pc105';
 
-    $XkbLayout ? {
+    {
 	XkbLayout => join(',', if_($keyboard->{GRP_TOGGLE}, 'us'), $XkbLayout),
 	XkbModel => $XkbModel,
-	XkbOptions => $keyboard->{GRP_TOGGLE} ? 
-		  join(',', 
-		       if_($keyboard->{GRP_TOGGLE} eq 'rwin_toggle', 'compose:rwin'), 
-		       "grp:$keyboard->{GRP_TOGGLE}", 
-		       'grp_led:scroll') : '',
-    } : { XkbDisable => '' };
+	XkbOptions => join(',', 
+			   if_($keyboard->{GRP_TOGGLE},
+			       if_($keyboard->{GRP_TOGGLE} eq 'rwin_toggle', 'compose:rwin'), 
+			       "grp:$keyboard->{GRP_TOGGLE}", 
+			       'grp_led:scroll'),
+			   if_(member($XkbLayout, 'az', 'tr', 'tr_f'), 'caps:shift')),
+    };
 }
 
 sub xmodmap_file {
-- 
cgit v1.2.1