summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-23 11:50:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-23 11:50:17 +0000
commit677f63e327af8a318f8094f0aa017138f69bf889 (patch)
tree8fd93b3f564fe54927e0c1967ffece30c7ea1fa1
parent0127bb06320f3e3424917ffef0d61ff486a87fad (diff)
downloaddrakx-677f63e327af8a318f8094f0aa017138f69bf889.tar
drakx-677f63e327af8a318f8094f0aa017138f69bf889.tar.gz
drakx-677f63e327af8a318f8094f0aa017138f69bf889.tar.bz2
drakx-677f63e327af8a318f8094f0aa017138f69bf889.tar.xz
drakx-677f63e327af8a318f8094f0aa017138f69bf889.zip
- fix setting "Screen <number>" for multi-head cards
- don't propose XFree3 when using multi-head
-rw-r--r--perl-install/Xconfig/card.pm13
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index da34d11bd..52860b931 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -367,7 +367,7 @@ sub multi_head_choices {
#- special case for multi head card using only one BusID.
@cards = map {
- map_index { { screen => $::i, %$_ } } ($_) x ($_->{MULTI_HEAD} || 1);
+ map_index { { Screen => $::i, %$_ } } ($_) x ($_->{MULTI_HEAD} || 1);
} @cards;
delete $_->{server} foreach @cards; #- XFree 3 doesn't handle multi head (?)
@@ -393,12 +393,11 @@ sub xfree_and_glx_choices {
#- XFree version available, better to parse available package and get version from it.
my ($xf4_ver, $xf3_ver) = ('4.2.0', '3.3.6');
- my @choices = do {
- #- basic installation, use of XFree 4.2 or XFree 3.3.
- my $xf3 = { text => _("XFree %s", $xf3_ver), code => sub { $card->{prefer_xf3} = 1 } };
- my $xf4 = { text => _("XFree %s", $xf4_ver), code => sub { $card->{prefer_xf3} = 0 } };
- $card->{prefer_xf3} ? ($xf3, $xf4) : ($xf4, $xf3);
- };
+ my $xf3 = { text => _("XFree %s", $xf3_ver), code => sub { $card->{prefer_xf3} = 1 } };
+ my $xf4 = { text => _("XFree %s", $xf4_ver), code => sub { $card->{prefer_xf3} = 0 } };
+
+ #- no XFree3 with multi-head
+ my @choices = $card->{cards} ? $xf4 : $card->{prefer_xf3} ? ($xf3, $xf4) : ($xf4, $xf3);
#- no GLX with Xinerama
return @choices if $card->{Xinerama};