[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'



 debian/changelog                                        |    4 +
 debian/patches/504_implement_passive_touch_ungrab.patch |   36 ++++++++++++++++
 debian/patches/series                                   |    1 
 3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 14fca0ce5fe663809dae9967585b836ef3e1ebf9
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date:   Thu Mar 29 16:40:59 2012 -0700

    Implement passive touch ungrab (LP: #968726)
    
    * Implement passive touch ungrab (LP: #968726)
      - Add temporary patch 503_implement_passive_touch_ungrab.patch

diff --git a/debian/changelog b/debian/changelog
index fc38802..9aa0537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ xorg-server (2:1.11.4-0ubuntu8) UNRELEASED; urgency=low
   [ Chase Douglas ]
   * Fix mouse warping and clipping (LP: #948938)
     - Add temporary patch 503_fix_mouse_warp.patch
+  * Implement passive touch ungrab (LP: #968726)
+    - Add temporary patch 503_implement_passive_touch_ungrab.patch
 
- -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 29 Mar 2012 15:38:53 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 29 Mar 2012 16:39:42 -0700
 
 xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
 
diff --git a/debian/patches/504_implement_passive_touch_ungrab.patch b/debian/patches/504_implement_passive_touch_ungrab.patch
new file mode 100644
index 0000000..48e8a0a
--- /dev/null
+++ b/debian/patches/504_implement_passive_touch_ungrab.patch
@@ -0,0 +1,36 @@
+Implement passive touch ungrabbing. (LP: #968726)
+
+diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
+index d911702..89a285f 100644
+--- a/Xi/xipassivegrab.c
++++ b/Xi/xipassivegrab.c
+@@ -303,14 +303,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
+     if (stuff->grab_type != XIGrabtypeButton &&
+         stuff->grab_type != XIGrabtypeKeycode &&
+         stuff->grab_type != XIGrabtypeEnter &&
+-        stuff->grab_type != XIGrabtypeFocusIn)
++        stuff->grab_type != XIGrabtypeFocusIn &&
++        stuff->grab_type != XIGrabtypeTouchBegin)
+     {
+         client->errorValue = stuff->grab_type;
+         return BadValue;
+     }
+ 
+     if ((stuff->grab_type == XIGrabtypeEnter ||
+-         stuff->grab_type == XIGrabtypeFocusIn) && stuff->detail != 0)
++         stuff->grab_type == XIGrabtypeFocusIn ||
++         stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0)
+     {
+         client->errorValue = stuff->detail;
+         return BadValue;
+@@ -336,6 +338,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
+         case XIGrabtypeKeycode:  tempGrab->type = XI_KeyPress;    break;
+         case XIGrabtypeEnter:   tempGrab->type = XI_Enter;       break;
+         case XIGrabtypeFocusIn: tempGrab->type = XI_FocusIn;     break;
++        case XIGrabtypeTouchBegin: tempGrab->type = XI_TouchBegin; break;
+     }
+     tempGrab->grabtype = XI2;
+     tempGrab->modifierDevice = mod_dev;
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 28b62b9..50bfb35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@
 501_touch_accept_end.patch
 502_indirect_touch_window_set.patch
 503_fix_mouse_warp.patch
+504_implement_passive_touch_ungrab.patch


Reply to: