From fff0fecf10c98f77bdefcea0254fe2f03f8b1c34 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 26 Aug 2004 11:52:41 +0000
Subject: define and use $o->{mouse}{alternate_install} if detected mouse can't
 be used during install

---
 perl-install/install_steps_gtk.pm | 4 +++-
 perl-install/mouse.pm             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 6bb030988..6c641ea8c 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -46,7 +46,9 @@ sub new($$) {
 	    if ($server eq 'Xnest') {
 		push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600');
 	    } elsif ($::globetrotter || !$::move) {
-		install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver);
+                #- use alternate mouse in install if mouse is unsafe or needs some specific module (e.g. synaptics)
+                my $mouse = is_empty_hash_ref($o->{mouse}{alternate_install}) ? $o->{mouse} : $o->{mouse}{alternate_install};
+		install_gtk::createXconf($f, @$mouse{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver);
 
 		push @options, if_(!$::globetrotter, '-kb'), '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
 		push @options, 'tty7', '-dpms', '-s', '240';
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 55067cad6..84714e2db 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -292,8 +292,8 @@ sub detect {
         my $synaptics_mouse;
         if (my $mouse_nb = grep { /^H: Handlers=mouse/ } @input_devices) {
             my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom);
-            $::isInstall && !$::o->{mouse} and return $univ_mouse; #- don't try to use synpatics at beginning of install
             if (any { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) {
+                $::isInstall && $synaptics->{alternate_install} = $univ_mouse; #- don't try to use synpatics at beginning of install
                 $synaptics_mouse = fullname2mouse('PS/2|Synaptics Touchpad');
                 $mouse_nb < 2 and return $synaptics_mouse;
                 $univ_mouse->{auxmouse} = $synaptics_mouse;
-- 
cgit v1.2.1