diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-06 22:48:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-06 22:48:08 +0000 |
| commit | bb6492e7bf3b348808cc2102c840fc91a3bff7b0 (patch) | |
| tree | 2b966cfe2b006a6cc66f575ee5f9995a787dc2ff /perl-install/Xconfigurator.pm | |
| parent | 5e2862087db257f94597369f6923eccc3ae6f419 (diff) | |
| download | drakx-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar drakx-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.gz drakx-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.bz2 drakx-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.xz drakx-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.zip | |
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 733fc9de9..3eb4f470b 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -2,7 +2,7 @@ package Xconfigurator; use diagnostics; use strict; -use vars qw($in $install $isLaptop $resolution_wanted @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $intro_text $finalcomment_text $s3_comment $cirrus_comment $probeonlywarning_text $monitorintro_text $hsyncintro_text $vsyncintro_text $XF86firstchunk_text $keyboardsection_start $keyboardsection_part2 $keyboardsection_end $pointersection_text1 $pointersection_text2 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $screensection_text1 %lines @options %xkb_options); +use vars qw($in $install $isLaptop $resolution_wanted @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $intro_text $finalcomment_text $s3_comment $cirrus_comment $probeonlywarning_text $monitorintro_text $hsyncintro_text $vsyncintro_text $XF86firstchunk_text $keyboardsection_start $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_end $pointersection_text1 $pointersection_text2 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $screensection_text1 %lines @options %xkb_options $default_monitor); use pci_probing::main; use common qw(:common :file :functional :system); @@ -218,7 +218,7 @@ sub monitorConfiguration(;$$) { readMonitorsDB(-e "MonitorsDB" ? "MonitorsDB" : "/usr/X11R6/lib/X11/MonitorsDB"); - add2hash($monitor, { type => $in->ask_from_list(_("Monitor"), _("Choose a monitor"), ['Unlisted', keys %monitors]) }) unless $monitor->{type}; + add2hash($monitor, { type => $in->ask_from_list(_("Monitor"), _("Choose a monitor"), ['Unlisted', keys %monitors], ' ' . translate($default_monitor)) }) unless $monitor->{type}; if ($monitor->{type} eq 'Unlisted') { $in->ask_from_entries_ref('', _("The two critical parameters are the vertical refresh rate, which is the rate @@ -341,6 +341,7 @@ sub testFinalConfig($;$$) { use my_gtk qw(:wrappers); $ENV{DISPLAY} = ":9"; + gtkset_mousecursor(68); gtkset_background(200 * 256, 210 * 256, 210 * 256); my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size; @@ -600,6 +601,8 @@ sub write_XF86Config { print F " RightAlt ", ($O->{altmeta} ? "ModeShift" : "Meta"), "\n"; print F $keyboardsection_part2; + print F " XkbDisable\n" unless $O->{xkb_keymap}; + print F $keyboardsection_part3; print F qq( XkbLayout "$O->{xkb_keymap}"\n); print F join '', map { " $_\n" } @{$xkb_options{$O->{xkb_keymap}} || []}; print F $keyboardsection_end; |