1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index e8b6ba01b..46c577b9f 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -7,6 +7,7 @@ use interactive;
 use standalone;
 use modules;
 use detect_devices;
+use Xconfig;
 use mouse;
 use c;
 
@@ -24,9 +25,15 @@ my $in = 'interactive'->vnew('su', 'mouse');
 
 undef $::Plug;
 begin:
+my ($curr_env) = Xconfig::getinfoFromXF86Config('');
 my ($mouse) = mouse::detect() unless $::noauto;
 my $time_tag2;
 
+#- now try to merge $curr_env->{mouse} with $mouse.
+$mouse->{XMOUSETYPE} eq $curr_env->{mouse}{XMOUSETYPE} ||
+    $mouse->{XMOUSETYPE} eq 'PS/2' && ($curr_env->{mouse}{XMOUSETYPE} =~ m|PS/2| ||
+				       $curr_env->{mouse}{auxmouse}{XMOUSETYPE} =~ m|PS/2|) and $mouse = $curr_env->{mouse};
+
 $::isEmbedded and kill USR2, $::CCPID;
 if (!$mouse || !$::auto) {
     $mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse");