summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
commit851338fe8bf4c8d057984431b542b333cbad4b8e (patch)
tree7029da4dde591025d410100a9b1b126967ba2f76 /perl-install/Xconfig.pm
parent91608779ad460d1481bec34e39db4661b4950441 (diff)
downloaddrakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.gz
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.bz2
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.xz
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.zip
no_comment
Diffstat (limited to 'perl-install/Xconfig.pm')
-rw-r--r--perl-install/Xconfig.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 438862971..585ed7247 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -30,7 +30,6 @@ sub getinfo {
add2hash($o->{mouse}, mouse::detect()) unless $o->{mouse}{XMOUSETYPE};
$o->{mouse}{device} ||= "mouse" if -e "/dev/mouse";
- $o->{mouse}{nbuttons} ||= mouse::X2nbuttons($o->{mouse}{XMOUSETYPE});
$o;
}
@@ -49,9 +48,11 @@ sub getinfoFromXF86Config {
} elsif (/^Section "Pointer"/ .. /^EndSection/) {
$o->{mouse}{XMOUSETYPE} ||= $1 if /^\s*Protocol\s+"(.*?)"/;
$o->{mouse}{device} ||= $1 if m|^\s*Device\s+"/dev/(.*?)"|;
- $o->{mouse}{XEMU3} ||= 1 if m/^\s*Emulate3Buttons\s+/;
$o->{mouse}{cleardtrrts} ||= 1 if m/^\s*ClearDTR\s+/;
$o->{mouse}{cleardtrrts} ||= 1 if m/^\s*ClearRTS\s+/;
+ $o->{mouse}{nbuttons} = 2 if m/^\s*Emulate3Buttons\s+/;
+ $o->{mouse}{nbuttons} ||= 5 if m/^\s*ZAxisMapping\s.*5/;
+ $o->{mouse}{nbuttons} = 7 if m/^\s*ZAxisMapping\s.*7/;
} elsif (my $i = /^Section "Device"/ .. /^EndSection/) {
%c = () if $i == 1;