diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 13:35:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 13:35:19 +0000 |
| commit | ede533057612d4a01c554f449f047399c0226532 (patch) | |
| tree | dd71837ec556c564fcc72c8b38627f31e4817009 /perl-install/Xconfigurator.pm | |
| parent | 90de85d9f5905f92507b78f32a43e354a6181e2f (diff) | |
| download | drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.gz drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.bz2 drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.xz drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.zip | |
handle XkbModel (especially for abnt2 (br))
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index cc884e74b..3eb484031 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -836,6 +836,14 @@ sub write_XF86Config { print G qq( Option "XkbDisable"\n) unless $O->{xkb_keymap}; print F $keyboardsection_part3; print G $keyboardsection_part3_v4; + + $O->{xkb_model} ||= + arch() =~ /ppc/ ? 'macintosh' : + arch() =~ /sparc/ ? 'sun' : + $O->{xkb_keymap} eq 'br' ? 'abnt2' : 'pc105'; + print F qq( XkbModel "$O->{xkb_model}"\n); + print G qq( Option "XkbModel" "$O->{xkb_model}"\n); + print F qq( XkbLayout "$O->{xkb_keymap}"\n); print G qq( Option "XkbLayout" "$O->{xkb_keymap}"\n); print F join '', map { " $_\n" } @{$xkb_options{$O->{xkb_keymap}} || []}; |