diff options
| -rw-r--r-- | perl-install/Xconfig/xfree.pm | 50 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 3 |
2 files changed, 40 insertions, 13 deletions
diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm index c82f21be0..5b225ab25 100644 --- a/perl-install/Xconfig/xfree.pm +++ b/perl-install/Xconfig/xfree.pm @@ -248,18 +248,44 @@ sub set_synaptics { #- from /usr/share/doc/synaptics-0.14.0/INSTALL $opt->("Device", $synaptics_mouse->{Device}), $opt->("Protocol", $synaptics_mouse->{Protocol}), - $opt->("LeftEdge", 1700), - $opt->("RightEdge", 5300), - $opt->("TopEdge", 1700), - $opt->("BottomEdge", 4200), - $opt->("FingerLow", 25), - $opt->("FingerHigh", 30), - $opt->("MaxTapTime", 180), - $opt->("MaxTapMove", 220), - $opt->("VertScrollDelta", 100), - $opt->("MinSpeed", '0.09'), - $opt->("MaxSpeed", '0.18'), - $opt->("AccelFactor", '0.0015'), + $synaptics_mouse->{ALPS} ? ( + #- from /usr/share/doc/synaptics-0.14.0/README.alps + #- and http://qa.mandrakesoft.com/show_bug.cgi?id=14512 + $opt->("LeftEdge", 120), + $opt->("RightEdge", 830), + $opt->("TopEdge", 120), + $opt->("BottomEdge", 650), + $opt->("FingerLow", 14), + $opt->("FingerHigh", 15), + $opt->("MaxTapTime", 180), + $opt->("MaxTapMove", 110), + $opt->("EmulateMidButtonTime", 75), + $opt->("VertScrollDelta", 20), + $opt->("HorizScrollDelta", 20), + $opt->("MinSpeed", '0.8'), + $opt->("MaxSpeed", '1.00'), + $opt->("AccelFactor", '0.015'), + $opt->("EdgeMotionMinSpeed", 200), + $opt->("EdgeMotionMaxSpeed", 200), + $opt->("UpDownScrolling", 1), + $opt->("CircularScrolling", 1), + $opt->("CircScrollDelta", '0.1'), + $opt->("CircScrollTrigger", 2), + $opt->("UpDownScrolling", 0), + ) : ( + $opt->("LeftEdge", 1700), + $opt->("RightEdge", 5300), + $opt->("TopEdge", 1700), + $opt->("BottomEdge", 4200), + $opt->("FingerLow", 25), + $opt->("FingerHigh", 30), + $opt->("MaxTapTime", 180), + $opt->("MaxTapMove", 220), + $opt->("VertScrollDelta", 100), + $opt->("MinSpeed", '0.09'), + $opt->("MaxSpeed", '0.18'), + $opt->("AccelFactor", '0.0015'), + ), $opt->("SHMConfig", "on"), }; $raw_X->add_Section('InputDevice', $h); diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 459c8ce61..28afa68aa 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -297,8 +297,9 @@ sub detect { return fullname2mouse('Universal|Microsoft Xbox Controller S'); } my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom); - if (any { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) { + if (my $synaptics_name = find { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) { $synaptics_mouse = fullname2mouse('Universal|Synaptics Touchpad'); + $synaptics_mouse->{ALPS} = $synaptics_name =~ /ALPS/; $::isInstall and $synaptics_mouse->{alternate_install} = $univ_mouse; #- do not try to use synpatics at beginning of install $mouse_nb < 2 and return $synaptics_mouse; $univ_mouse->{auxmouse} = $synaptics_mouse; |