← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xorg-server/quantal-updates

« back to all changes in this revision

Viewing changes to debian/patches/606-Implement-early-touch-reject.patch

  • Committer: Package Import Robot
  • Author(s): Chase Douglas
  • Date: 2012-03-07 15:36:20 UTC
  • Revision ID: package-import@ubuntu.com-20120307153620-v2789zwz1n3irs3b
Tags: 2:1.11.4-0ubuntu5
https://launchpad.net/bugs/929408
* Update to 1.12 input stack 
* Drop input patches that have been merged upstream:
  - 600-Revert-dix-deduplicate-callers-of-DeliverDeviceEvent.patch
  - 601-Store-window-pointer-in-touch-listener-record.patch
  - 602-Factor-out-TouchEnd-generation-and-delivery.patch
  - 603-Export-TouchEventRejected-as-TouchRejected.patch
  - 604-Move-AllowTouch-to-dix-touch.c-and-rename-to-TouchAc.patch
  - 605-Check-for-proper-window-ID-when-processing-touch-all.patch
  - 606-Implement-early-touch-reject.patch
  - 607-Implement-touch-early-accept.patch
  - 608-dix-fix-an-out-of-memory-crash.patch
  - 609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
  - 610-Fix-scrolling.patch
  - 611-Fix-touch-punt-crash.patch
  - 612-Fix-vcp-touches-corruption.patch
  - 613-Keep-vcp-touch-class.patch
* Fix indirect touch grab handling (LP: #929408)
  - Add temporary patch 501_touch_accept_end.patch
  - Add temporary patch 502_indirect_touch_window_set.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/606-Implement-early-touch-reject.patch
1
 
From b0c54856df71f9cabf9dad176fdade960ef8c5d9 Mon Sep 17 00:00:00 2001
2
 
From: Chase Douglas <chase.douglas@canonical.com>
3
 
Date: Fri, 3 Feb 2012 16:19:10 -0800
4
 
Subject: [PATCH] Implement early touch reject
5
 
 
6
 
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
7
 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
8
 
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
9
 
---
10
 
 dix/touch.c |    9 ++++++++-
11
 
 1 files changed, 8 insertions(+), 1 deletions(-)
12
 
 
13
 
diff --git a/dix/touch.c b/dix/touch.c
14
 
index 7daf81b..f55bb8c 100644
15
 
--- a/dix/touch.c
16
 
+++ b/dix/touch.c
17
 
@@ -1019,9 +1019,16 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
18
 
     if (i == ti->num_listeners)
19
 
         return BadAccess;
20
 
 
21
 
-    /* FIXME: Implement early accept/reject */
22
 
     if (i > 0)
23
 
+    {
24
 
+        if (mode == XIRejectTouch)
25
 
+        {
26
 
+            TouchRejected(dev, ti, ti->listeners[i].listener, NULL);
27
 
+            return Success;
28
 
+        }
29
 
+        /* FIXME: Implement early accept */
30
 
         return BadAccess;
31
 
+    }
32
 
 
33
 
     nev = GetTouchOwnershipEvents(events, dev, ti, mode,
34
 
                                   ti->listeners[0].listener, 0);
35
 
1.7.8.3
36