summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-08 10:48:20 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-08 10:48:20 +0000
commitc5a4cbe6c55d38bcc411bd94f088f36b85681899 (patch)
tree42b034850992031870fc372f2e462c5606ce99d2 /perl-install
parente6f9ebfab4e172624d4a78b447c1492fc1f36169 (diff)
downloaddrakx-backup-do-not-use-c5a4cbe6c55d38bcc411bd94f088f36b85681899.tar
drakx-backup-do-not-use-c5a4cbe6c55d38bcc411bd94f088f36b85681899.tar.gz
drakx-backup-do-not-use-c5a4cbe6c55d38bcc411bd94f088f36b85681899.tar.bz2
drakx-backup-do-not-use-c5a4cbe6c55d38bcc411bd94f088f36b85681899.tar.xz
drakx-backup-do-not-use-c5a4cbe6c55d38bcc411bd94f088f36b85681899.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index f44a9ad21..58fb85718 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -109,8 +109,8 @@ sub getinfoFromSysconfig {
sub getinfoFromDDC {
my $o = shift || {};
my $O = $o->{monitor} ||= {};
- return $o if $O->{hsyncrange} && $O->{vsyncrange} && $O->{modelines};
- my ($m, @l) = `ddcxinfos`;
+ #- return $o if $O->{hsyncrange} && $O->{vsyncrange} && $O->{modelines};
+ my ($m, @l) = `./ddcxinfos`;
$? == 0 or return $o;
$o->{card}{memory} ||= to_int($m);
@@ -118,8 +118,8 @@ sub getinfoFromDDC {
my ($depth, $x, $y) = split;
$depth = int(log($depth) / log(2));
if ($depth >= 8 && $x >= 640) {
- push @{$o->{card}{depth}{$depth}}, [ $x, $y ];
- push @{$o->{card}{depth}{32}}, [ $x, $y ] if $depth == 24;
+ push @{$o->{card}{depth}{$depth}}, [ $x, $y ] unless scalar grep { $_->[0] == $x && $_->[1] == $y } @{$o->{card}{depth}{$depth}};
+ push @{$o->{card}{depth}{32}}, [ $x, $y ] if $depth == 24 && ! scalar grep { $_->[0] == $x && $_->[1] == $y } @{$o->{card}{depth}{32}};
}
}
my ($h, $v, $size, @m) = @l;