summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-21 17:24:32 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-21 17:24:32 +0000
commit42076ad2ab3403995171dc9e0519e05e033a45d3 (patch)
tree938a4b46843d498c3168ba25c005f20816c18be2
parent344a6108f25f8e5f4226b50b186864a3dee1d9f5 (diff)
downloaddrakx-42076ad2ab3403995171dc9e0519e05e033a45d3.tar
drakx-42076ad2ab3403995171dc9e0519e05e033a45d3.tar.gz
drakx-42076ad2ab3403995171dc9e0519e05e033a45d3.tar.bz2
drakx-42076ad2ab3403995171dc9e0519e05e033a45d3.tar.xz
drakx-42076ad2ab3403995171dc9e0519e05e033a45d3.zip
upgrade for XF86Config, take care of resolution and depth wanted.
-rw-r--r--perl-install/Xconfigurator.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 163801f13..8956a4cb6 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -537,6 +537,7 @@ sub autoDefaultDepth($$) {
#- try to have resolution_wanted
$best = max($best || 0, $d) if $r->[0][0] >= $wres_wanted;
+ $best = $card->{suggest_depth}, last if $r->[0][0] >= $wres_wanted || $r->[0][0] >= $card->{suggest_wres};
}
$best || $depth or die "no valid modes";
}
@@ -658,7 +659,7 @@ sub resolutionsConfiguration {
#- remove unusable resolutions (based on the video memory size and the monitor hsync rate)
keepOnlyLegalModes($card, $o->{monitor});
- my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size});
+ my $res = $o->{resolution_wanted} || $card->{suggest_wres} || autoDefaultResolution($o->{monitor}{size});
my $wres = first(split 'x', $res);
#- take the first available resolution <= the wanted resolution
@@ -1029,8 +1030,8 @@ sub info {
$info .= _("Graphic card: %s\n", $o->{card}{type});
$info .= _("Graphic memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory};
if ($o->{default_depth} and my $depth = $o->{card}{depth}{$o->{default_depth}}) {
- $info .= _("Color depth: %s\n", translate($depths{$o->{default_depth}}));
- $info .= _("Resolution: %s\n", join "x", @{$depth->[0]}) if $depth && !is_empty_array_ref($depth->[0]);
+ $info .= _("Color depth: %s\n", translate($depths{$o->{default_depth}}));
+ $info .= _("Resolution: %s\n", join "x", @{$depth->[0]}) if $depth && !is_empty_array_ref($depth->[0]);
}
$info .= _("XFree86 server: %s\n", $o->{card}{server}) if $o->{card}{server};
$info .= _("XFree86 driver: %s\n", $o->{card}{driver}) if $o->{card}{driver};