← Back to branch summary

~ubuntu-branches/ubuntu/precise/xserver-xorg-input-evdev/precise

« back to all changes in this revision

Viewing changes to debian/patches/100-fix-touchup-problem-on-touchpads.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chase Douglas
  • Date: 2011-02-21 18:50:15 UTC
  • Revision ID: james.westby@ubuntu.com-20110221185015-tenmhisvy6d29bki
Tags: 1:2.6.0-1ubuntu7
* Drop 100-fix-touchup-problem-on-touchpads.patch
  - Upstream fixed the issue
* Add xi 2.1 support
  - Added 100-xi2.1.patch
  - Refreshed 101-gestures.patch
  - Bump dependency on xserver-xorg-dev for xi 2.1
  - Add new xi 2.1 dependency on libmtdev-dev and libutouch-grail1-dev
  - Bump runtime dependency on libutouch-grail1 to 1.0.19
* Revert rule for Magic Trackpad, synaptics will handle it now

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/100-fix-touchup-problem-on-touchpads.patch
1
 
Fix touchup problem on touchpads
2
 
 
3
 
Index: xserver-xorg-input-evdev/src/evdev.c
4
 
===================================================================
5
 
--- xserver-xorg-input-evdev.orig/src/evdev.c   2011-01-28 10:53:25.000000000 +1100
6
 
+++ xserver-xorg-input-evdev/src/evdev.c        2011-01-28 12:04:51.761087000 +1100
7
 
@@ -384,7 +384,7 @@
8
 
     *num_v = *first_v = 0;
9
 
 
10
 
     /* convert to relative motion for touchpads */
11
 
-    if (pEvdev->abs_queued && (pEvdev->flags & EVDEV_RELATIVE_MODE)) {
12
 
+    if (pEvdev->flags & EVDEV_RELATIVE_MODE) {
13
 
         if (pEvdev->in_proximity) {
14
 
             if (pEvdev->old_vals[0] != -1)
15
 
                 pEvdev->delta[REL_X] = pEvdev->vals[0] - pEvdev->old_vals[0];
16
 
@@ -397,8 +397,10 @@
17
 
         } else {
18
 
             pEvdev->old_vals[0] = pEvdev->old_vals[1] = -1;
19
 
         }
20
 
-        pEvdev->abs_queued = 0;
21
 
-        pEvdev->rel_queued = 1;
22
 
+       if (pEvdev->abs_queued) {
23
 
+           pEvdev->abs_queued = 0;
24
 
+           pEvdev->rel_queued = 1;
25
 
+       }
26
 
     }
27
 
 
28
 
     if (pEvdev->rel_queued) {