diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | lib/Xconfig/xfree.pm | 4 | ||||
| -rw-r--r-- | lib/mouse.pm | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +- for evdev configured mice, specify bustype + (useful for "Macintosh mouse button emulation" which has same vendor/product + as "AT Translated Set 2 keyboard") + (need drakxtools-backend 10.4.203) + Version 0.26 - 17 September 2007, by Pascal "Pixel" Rigaux - handle fglrx-hd2000 driver (Anssi) diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index 5c3f5bc..c6b3e28 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -136,8 +136,8 @@ sub _new_keyboard_section { # mouse ######################################################################## ################################################################################ #- example mouse: { Protocol => 'IMPS/2', Device => '/dev/psaux', Emulate3Buttons => undef, Emulate3Timeout => 50, ZAxisMapping => [ '4 5', '6 7' ] } -#- example evdev: { vendor => '0x045e', product => '0x008c' } -my @mouse_fields = qw(Protocol Device ZAxisMapping Emulate3Buttons Emulate3Timeout vendor product); #-); +#- example evdev: { bustype => '0x0003', vendor => '0x045e', product => '0x008c' } +my @mouse_fields = qw(Protocol Device ZAxisMapping Emulate3Buttons Emulate3Timeout bustype vendor product); #-); sub get_mice { my ($raw_X) = @_; my @raw_mice = $raw_X->get_Sections('InputDevice', \&_is_mouse); diff --git a/lib/mouse.pm b/lib/mouse.pm index f57ddad..0eef408 100644 --- a/lib/mouse.pm +++ b/lib/mouse.pm @@ -289,7 +289,7 @@ sub mice2evdev { #- we always use HWheelRelativeAxisButtons for evdev, it tells mice with no horizontal wheel to skip those buttons #- that way we ensure 6 & 7 is always horizontal wheel #- (cf patch skip-HWheelRelativeAxisButtons-even-if-unused in x11-driver-input-evdev) - { vendor => "0x$_->{vendor}", product => "0x$_->{id}", HWheelRelativeAxisButtons => "7 6" }; + { bustype => "0x$_->{bustype}", vendor => "0x$_->{vendor}", product => "0x$_->{id}", HWheelRelativeAxisButtons => "7 6" }; } @mice ] } |