summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-13 12:10:14 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-13 12:10:14 +0000
commit9efb0e8733d7d48bc2ee3054e85f0d4827db49a9 (patch)
tree26fa0d95a72d7d9aa52ca27eafc6e2bc6be880ce /perl-install/Xconfigurator.pm
parent3e7ac9af750f6c4968d38ea5e6717a4940db7dc2 (diff)
downloaddrakx-9efb0e8733d7d48bc2ee3054e85f0d4827db49a9.tar
drakx-9efb0e8733d7d48bc2ee3054e85f0d4827db49a9.tar.gz
drakx-9efb0e8733d7d48bc2ee3054e85f0d4827db49a9.tar.bz2
drakx-9efb0e8733d7d48bc2ee3054e85f0d4827db49a9.tar.xz
drakx-9efb0e8733d7d48bc2ee3054e85f0d4827db49a9.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 1879e45b2..63d0837a0 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -192,6 +192,7 @@ sub monitorConfiguration(;$) {
add2hash($monitor, { type => $in->ask_from_list('', _("Choose a monitor"), [keys %monitors]) }) unless $monitor->{type};
add2hash($monitor, $monitors{$monitor->{type}});
add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown" });
+
$monitor;
}
@@ -502,6 +503,8 @@ sub write_XF86Config {
#- Write monitor section.
$O = $o->{monitor};
+ $O->{modelines} ||= $o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text;
+
print F $monitorsection_text1;
print F qq( Identifier "$O->{type}"\n);
print F qq( VendorName "$O->{vendor}"\n);
@@ -514,10 +517,8 @@ sub write_XF86Config {
print F qq( VertRefresh $O->{vsyncrange}\n);
print F "\n";
print F $monitorsection_text4;
- print F ($o->{card}{type} eq "TG 96" ?
- $modelines_text_Trident_TG_96xx :
- $modelines_text);
- print F "EndSection\n\n\n";
+ print F $O->{modelines} || ($o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text);
+ print F "\nEndSection\n\n\n";
#- Write Device section.
$O = $o->{card};