summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-29 16:46:56 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-29 16:46:56 +0000
commit17675cf6acfe4d3b9e092284484371dc3bdcc7e1 (patch)
tree04f711b53f2630e41dc184b85cea77d02538c2fd
parent84d7e853eee6c2a8000024b0ab03f8af81d4bdeb (diff)
downloaddrakx-17675cf6acfe4d3b9e092284484371dc3bdcc7e1.tar
drakx-17675cf6acfe4d3b9e092284484371dc3bdcc7e1.tar.gz
drakx-17675cf6acfe4d3b9e092284484371dc3bdcc7e1.tar.bz2
drakx-17675cf6acfe4d3b9e092284484371dc3bdcc7e1.tar.xz
drakx-17675cf6acfe4d3b9e092284484371dc3bdcc7e1.zip
try to merge already existing mouse configuration with what has been probed,
change if mouse is really changed as probe is incomplete.
-rwxr-xr-xperl-install/standalone/mousedrake7
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");