summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-03-27 16:18:09 +0000
committerFrancois Pons <fpons@mandriva.com>2001-03-27 16:18:09 +0000
commitf556c155733ad72b83ee0a61e5e4bd423a2aed64 (patch)
tree3f8cefe1626ec17970bfe7eb0ad05a0cb7eee355
parent764afd8a582e53c536045b8cf24f4ee2ba4f4ed7 (diff)
downloaddrakx-f556c155733ad72b83ee0a61e5e4bd423a2aed64.tar
drakx-f556c155733ad72b83ee0a61e5e4bd423a2aed64.tar.gz
drakx-f556c155733ad72b83ee0a61e5e4bd423a2aed64.tar.bz2
drakx-f556c155733ad72b83ee0a61e5e4bd423a2aed64.tar.xz
drakx-f556c155733ad72b83ee0a61e5e4bd423a2aed64.zip
fixed mouse support for XF3, only one mouse supported currently.
-rw-r--r--perl-install/Xconfigurator.pm31
1 files changed, 15 insertions, 16 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index fe5b05764..21ea3acd2 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -846,38 +846,37 @@ sub write_XF86Config {
#- Write pointer section.
my $pointer = sub {
my ($O, $id) = @_;
- print F qq(Section "Pointer"\n);
+ $id > 1 or print F qq(Section "Pointer"\n);
print G qq(Section "InputDevice"\n\n);
- print F qq( DeviceName "Mouse$id"\n);
print G qq( Identifier "Mouse$id"\n);
print G qq( Driver "mouse"\n);
- print F qq( Protocol "$O->{XMOUSETYPE}"\n);
+ $id > 1 or print F qq( Protocol "$O->{XMOUSETYPE}"\n);
print G qq( Option "Protocol" "$O->{XMOUSETYPE}"\n);
- print F qq( Device "/dev/$O->{device}"\n);
+ $id > 1 or print F qq( Device "/dev/$O->{device}"\n);
print G qq( Option "Device" "/dev/$O->{device}"\n);
#- this will enable the "wheel" or "knob" functionality if the mouse supports it
- print F " ZAxisMapping 4 5\n" if $O->{nbuttons} > 3;
- print F " ZAxisMapping 6 7\n" if $O->{nbuttons} > 5;
+ $id > 1 or print F " ZAxisMapping 4 5\n" if $O->{nbuttons} > 3;
+ $id > 1 or print F " ZAxisMapping 6 7\n" if $O->{nbuttons} > 5;
print G qq( Option "ZAxisMapping" "4 5"\n) if $O->{nbuttons} > 3;
print G qq( Option "ZAxisMapping" "6 7"\n) if $O->{nbuttons} > 5;
- print F "#" unless $O->{nbuttons} < 3;
+ $id > 1 or print F "#" unless $O->{nbuttons} < 3;
print G "#" unless $O->{nbuttons} < 3;
- print F qq( Emulate3Buttons\n);
+ $id > 1 or print F qq( Emulate3Buttons\n);
print G qq( Option "Emulate3Buttons"\n);
- print F "#" unless $O->{nbuttons} < 3;
+ $id > 1 or print F "#" unless $O->{nbuttons} < 3;
print G "#" unless $O->{nbuttons} < 3;
- print F qq( Emulate3Timeout 50\n\n);
+ $id > 1 or print F qq( Emulate3Timeout 50\n\n);
print G qq( Option "Emulate3Timeout" "50"\n\n);
- print F "# ChordMiddle is an option for some 3-button Logitech mice\n\n";
+ $id > 1 or print F "# ChordMiddle is an option for some 3-button Logitech mice\n\n";
print G "# ChordMiddle is an option for some 3-button Logitech mice\n\n";
- print F "#" unless $O->{chordmiddle};
+ $id > 1 or print F "#" unless $O->{chordmiddle};
print G "#" unless $O->{chordmiddle};
- print F qq( ChordMiddle\n\n);
+ $id > 1 or print F qq( ChordMiddle\n\n);
print G qq( Option "ChordMiddle"\n\n);
- print F " ClearDTR\n" if $O->{cleardtrrts};
- print F " ClearRTS\n\n" if $O->{cleardtrrts};
- print F "EndSection\n\n\n";
+ $id > 1 or print F " ClearDTR\n" if $O->{cleardtrrts};
+ $id > 1 or print F " ClearRTS\n\n" if $O->{cleardtrrts};
+ $id > 1 or print F "EndSection\n\n\n";
print G "EndSection\n\n\n";
};
print F $pointersection_text;