1 files changed, 0 insertions, 128 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
deleted file mode 100644
index de356c0e3..000000000
--- a/perl-install/Xconfig/various.pm
+++ /dev/null
@@ -1,128 +0,0 @@
-package Xconfig::various; # $Id$
-
-use diagnostics;
-use strict;
-
-use Xconfig::card;
-use Xconfig::default;
-use Xconfig::resolution_and_depth;
-use common;
-use any;
-
-
-sub show_info {
-    my ($in, $X) = @_;
-    $in->ask_warn('', info($X));
-}
-
-sub info {
-    my ($raw_X, $card) = @_;
-    my $info;
-    my $xf_ver = Xconfig::card::using_xf4($card) ? "4.2.0" : "3.3.6";
-    my $title = $card->{use_DRI_GLX} || $card->{use_UTAH_GLX} ?
-		 _("XFree %s with 3D hardware acceleration", $xf_ver) : _("XFree %s", $xf_ver);
-    my $keyboard = eval { $raw_X->get_keyboard } || {};
-    my $monitor = eval { $raw_X->get_monitor } || {};
-    my $device = eval { $raw_X->get_device } || {};
-    my $mouse = eval { first($raw_X->get_mice) } || {};
-
-    $info .= _("Keyboard layout: %s\n", $keyboard->{XkbLayout});
-    $info .= _("Mouse type: %s\n", $mouse->{Protocol});
-    $info .= _("Mouse device: %s\n", $mouse->{Device}) if $::expert;
-    $info .= _("Monitor: %s\n", $monitor->{ModelName});
-    $info .= _("Monitor HorizSync: %s\n", $monitor->{HorizSync}) if $::expert;
-    $info .= _("Monitor VertRefresh: %s\n", $monitor->{VertRefresh}) if $::expert;
-    $info .= _("Graphics card: %s\n", $device->{VendorName} . ' '. $device->{BoardName});
-    $info .= _("Graphics memory: %s kB\n", $device->{VideoRam}) if $device->{VideoRam};
-    if (my $resolution = eval { $raw_X->get_resolution }) {
-	$info .= _("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}}));
-	$info .= _("Resolution: %s\n", join('x', @$resolution{'X', 'Y'}));
-    }
-    $info .= _("XFree86 server: %s\n", $card->{server}) if $card->{server};
-    $info .= _("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver};
-    "$title\n\n$info";
-}
-
-sub various {
-    my ($in, $card, $options, $auto) = @_;
-
-    tvout($in, $card, $options);
-    choose_xdm($in, $auto);
-}
-
-sub choose_xdm {
-    my ($in, $auto) = @_;
-    my $xdm = $::isStandalone ? any::runlevel($::prefix) : 1;
-
-    if (!$auto || $::isStandalone) {
-	$in->set_help('configureXxdm') if !$::isStandalone;
-
-	$xdm = $in->ask_yesorno(_("Graphical interface at startup"),
-_("I can setup your computer to automatically start the graphical interface (XFree) upon booting.
-Would you like XFree to start when you reboot?"), $xdm) or return
-    }
-    any::runlevel($::prefix, $xdm ? 5 : 3);
-}
-
-sub tvout {
-    my ($in, $card, $options) = @_;
-
-    $card->{FB_TVOUT} && Xconfig::card::using_xf4($card) && $options->{allowFB} or return;
-
-    $in->ask_yesorno('', _("Your graphic card seems to have a TV-OUT connector.
-It can be configured to work using frame-buffer.
-
-For this you have to plug your graphic card to your TV before booting your computer.
-Then choose the \"TVout\" entry in the bootloader
-
-Do you have this feature?")) or return;
-
-    my $norm = $in->ask_from_list('', _("What norm is your TV using?"), [ 'NTSC', 'PAL' ]) or return;
-
-    configure_FB_TVOUT({ norm => $norm });
-}
-
-sub configure_FB_TVOUT {
-    my ($use_FB_TVOUT) = @_;
-
-    my $raw_X = Xconfig::default::configure();
-    my $xfree4 = $raw_X->{xfree4};
-
-    $xfree4->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) });
-    $xfree4->set_devices({ Driver => 'fbdev' });
-
-    my ($device) = $xfree4->get_devices;
-    my ($monitor) = $xfree4->get_monitors;
-    $xfree4->set_screens({ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} });
-
-    my $Screen = $xfree4->get_default_screen;
-    $Screen->{Display} = [ map { { l => { Depth => { val => $_ } } } } 8, 16 ];
-
-    $xfree4->write("$::prefix/etc/X11/XF86Config-4.tvout");
-
-    check_XF86Config_symlink();
-
-    {
-	require bootloader;
-	require fsedit;
-	require detect_devices;
-	my ($bootloader, $all_hds) =
-	  $::isInstall ? ($::o->{bootloader}, $::o->{all_hds}) : 
-	    (bootloader::read(), fsedit::hds([ detect_devices::hds() ], {}));
-	
-	if (my $tvout = bootloader::duplicate_kernel_entry($bootloader, 'TVout')) {
-	    $tvout->{append} .= " XFree=tvout";
-	    bootloader::install($bootloader, [ fsedit::get_all_fstab($all_hds) ], $all_hds->{hds});
-	}
-    }
-}
-
-sub check_XF86Config_symlink {
-    my $f = "$::prefix/etc/X11/XF86Config-4";
-    if (!-l $f && -e "$f.tvout") {
-	rename $f, "$f.standard";
-	symlink "XF86Config-4.standard", $f;
-    }
-}
-
-1;