summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-10 10:48:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-10 10:48:28 +0000
commit81f7c4415d4ba35d8294b9c8e913bfdb57a6952c (patch)
treed47a97decb0a1fbde27635f39f2e90f527b0c2f9
parent8cb6a5cccbf6b2c71c0aec28672b29794faa6df7 (diff)
downloaddrakx-backup-do-not-use-81f7c4415d4ba35d8294b9c8e913bfdb57a6952c.tar
drakx-backup-do-not-use-81f7c4415d4ba35d8294b9c8e913bfdb57a6952c.tar.gz
drakx-backup-do-not-use-81f7c4415d4ba35d8294b9c8e913bfdb57a6952c.tar.bz2
drakx-backup-do-not-use-81f7c4415d4ba35d8294b9c8e913bfdb57a6952c.tar.xz
drakx-backup-do-not-use-81f7c4415d4ba35d8294b9c8e913bfdb57a6952c.zip
we don't want the 4/3 detailed_timings otherwise they conflict with the Xorg builtin vesamodes
-rw-r--r--perl-install/Xconfig/monitor.pm11
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index f085df86c..f94177c6f 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -180,8 +180,15 @@ sub getinfoFromDDC() {
$monitor->{ModeLine} = Xconfig::xfree::default_ModeLine();
my $detailed_timings = $monitor->{detailed_timings} || [];
foreach (grep { !$_->{bad_ratio} } @$detailed_timings) {
- unshift @{$monitor->{ModeLine}},
- { val => $_->{ModeLine}, pre_comment => $_->{ModeLine_comment} . "\n" };
+ my $res = join('x', $_->{horizontal_active}, $_->{horizontal_active});
+ my $ratio = $_->{horizontal_active} / $_->{vertical_active};
+
+ if (abs($ratio - 4 / 3) < 0.01) {
+ #- we don't want the 4/3 modelines otherwise they conflict with the Xorg builtin vesamodes
+ } else {
+ unshift @{$monitor->{ModeLine}},
+ { val => $_->{ModeLine}, pre_comment => $_->{ModeLine_comment} . "\n" };
+ }
if (@$detailed_timings == 1) {
#- should we care about {has_preferred_timing} ?