diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-08-26 12:04:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-08-26 12:04:07 +0000 |
| commit | 136ad7b5d783f662f1c9c281ea01c135fadc72ea (patch) | |
| tree | c89ece9669be2a727a3b28cf49d68caa9024575c | |
| parent | 6de4e476ca9dfd67d3bca0748a7f036e61718283 (diff) | |
| download | drakx-136ad7b5d783f662f1c9c281ea01c135fadc72ea.tar drakx-136ad7b5d783f662f1c9c281ea01c135fadc72ea.tar.gz drakx-136ad7b5d783f662f1c9c281ea01c135fadc72ea.tar.bz2 drakx-136ad7b5d783f662f1c9c281ea01c135fadc72ea.tar.xz drakx-136ad7b5d783f662f1c9c281ea01c135fadc72ea.zip | |
- don't set XkbCompat to group_led, it's better to use grp_led:scroll in
XkbOptions
- also set compose:rwin if GRP_TOGGLE is not rwin_toggle. rationale:
Also, for multilayout keyboards, it would be nice to also
in XkbOptions "compose:rwin" to define the right windows
key as the compose key (unless "rwin_toggle" has been
choosen to toggle the layouts) "compose:rwin" is the
default when loading a single latin layout, but is lost
when loading several layouts...
| -rw-r--r-- | perl-install/keyboard.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 341224289..fe8d40268 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -420,8 +420,11 @@ sub keyboard2full_xkb { $XkbLayout ? { XkbLayout => join(',', if_($keyboard->{GRP_TOGGLE}, 'us'), $XkbLayout), XkbModel => $XkbModel, - XkbOptions => $keyboard->{GRP_TOGGLE} ? "grp:$keyboard->{GRP_TOGGLE}" : '', - XkbCompat => $keyboard->{GRP_TOGGLE} ? "default+group_led" : '', + XkbOptions => $keyboard->{GRP_TOGGLE} ? + join(',', + if_($keyboard->{GRP_TOGGLE} eq 'rwin_toggle', 'compose:rwin'), + "grp:$keyboard->{GRP_TOGGLE}", + 'grp_led:scroll') : '', } : { XkbDisable => '' }; } |