summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-23 16:41:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-23 16:41:38 +0000
commitf277b072442439fa78f16f5fb75869793620e397 (patch)
tree3dee6ee8a0861eb5bb0b39902879217656351b0b
parent674eaf78680f3ce36108f644ef65fe8719d8402d (diff)
downloaddrakx-backup-do-not-use-f277b072442439fa78f16f5fb75869793620e397.tar
drakx-backup-do-not-use-f277b072442439fa78f16f5fb75869793620e397.tar.gz
drakx-backup-do-not-use-f277b072442439fa78f16f5fb75869793620e397.tar.bz2
drakx-backup-do-not-use-f277b072442439fa78f16f5fb75869793620e397.tar.xz
drakx-backup-do-not-use-f277b072442439fa78f16f5fb75869793620e397.zip
(to_string): created, try to shortly describe current configuration
(configure_FB_TVOUT): don't do anything when not using XF4
-rw-r--r--perl-install/Xconfig/various.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index ae74020fb..2ea15e841 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -9,6 +9,12 @@ use Xconfig::resolution_and_depth;
use common;
+sub to_string {
+ my ($raw_X) = @_;
+
+ $raw_X->is_fbdev ? 'frame-buffer' : Xconfig::resolution_and_depth::to_string($raw_X->get_resolution);
+}
+
sub info {
my ($raw_X, $card) = @_;
my $info;
@@ -97,6 +103,7 @@ sub configure_FB_TVOUT {
my $raw_X = Xconfig::default::configure();
my $xfree4 = $raw_X->{xfree4};
+ return if is_empty_array_ref($xfree4);
$xfree4->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) });
first($xfree4->get_monitor_sections)->{ModeLine} = [