← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xserver-xorg-input-synaptics/karmic

« back to all changes in this revision

Viewing changes to debian/patches/105_correct_multifinger_click.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker (Sarvatt)
  • Date: 2009-06-28 18:13:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090628181352-dqxi2xy86pdsfl16
Tags: 1.1.2-1ubuntu1
https://launchpad.net/bugs/378391
* Merge from Debian unstable, Remaining changes:
  - Restore the Ubuntu patch series. (LP: #378391)
   - 103_enable_cornertapping.patch: Enable right/middle clicks by
     tapping in the bottom- and top-right corners.
   - 104_always_enable_tapping.patch: Enable tapping regardless of the
     presence of physical buttons.
   - 105_correct_multifinger_click.patch: Swap the right/middle clicks
     generated by multi-finger tapping.
   - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge 
     tapping by default even if we enable two-finger scrolling as well.
   - 110_remove_bound_auto_adjust.patch: Don't auto-adjust to bounds of
     the hardware scroll area.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/105_correct_multifinger_click.patch
 
1
diff -Nur xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c xfree86-driver-synaptics-0.99.3/src/synaptics.c
 
2
--- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c        2008-12-15 00:33:15.000000000 +0100
 
3
+++ xfree86-driver-synaptics-0.99.3/src/synaptics.c     2009-01-31 18:40:37.000000000 +0100
 
4
@@ -411,8 +411,8 @@
 
5
     /* Enable multifinger-click if we don't have right/middle button,
 
6
        otherwise clickFinger is always button 1. */
 
7
     clickFinger1 = 1;
 
8
-    clickFinger2 = priv->has_right ? 1 : 3;
 
9
-    clickFinger3 = priv->has_middle ? 1 : 2;
 
10
+    clickFinger2 = priv->has_right ? 1 : 2;
 
11
+    clickFinger3 = priv->has_middle ? 1 : 3;
 
12
 
 
13
     /* Enable vert edge scroll if we can't detect doubletap */
 
14
     vertEdgeScroll = priv->has_double ? FALSE : TRUE;