diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-03-23 10:07:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-03-23 10:07:12 +0000 |
| commit | c9f86c7e305b54214444ad538fef1dbd98648f5a (patch) | |
| tree | 9487b369bc48b81e9dd53483c5dd57944256afd1 | |
| parent | b4f641721706292a9f7d46783089a22b5db438f5 (diff) | |
| download | drakx-backup-do-not-use-c9f86c7e305b54214444ad538fef1dbd98648f5a.tar drakx-backup-do-not-use-c9f86c7e305b54214444ad538fef1dbd98648f5a.tar.gz drakx-backup-do-not-use-c9f86c7e305b54214444ad538fef1dbd98648f5a.tar.bz2 drakx-backup-do-not-use-c9f86c7e305b54214444ad538fef1dbd98648f5a.tar.xz drakx-backup-do-not-use-c9f86c7e305b54214444ad538fef1dbd98648f5a.zip | |
- az, tr and tr_f needs XkbOptions 'caps:shift'
- cleanup
| -rw-r--r-- | perl-install/keyboard.pm | 17 |
1 files changed, 9 insertions, 8 deletions
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 { |