summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorJun Zhu <R01007@freescale.com>2015-01-27 11:12:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:50 +0000
commitb7d334df3c187e78b784330f85bbdb7e12086945 (patch)
tree7067bac843df75cdc75f2ee9e978f8b29a139e0c /meta/recipes-graphics/xorg-xserver
parent14ef8b98bb581cee7518b668ba43c1240ae82d8b (diff)
downloadpoky-b7d334df3c187e78b784330f85bbdb7e12086945.tar.gz
xserver-xorg: Add the patch to fix subwindow in Xi emulated events
(From OE-Core rev: e82c9e8098326f2ec070471b7a3daed21cc2cd28) Signed-off-by: Jun Zhu <R01007@freescale.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch41
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch
new file mode 100644
index 0000000000..604d23a376
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch
@@ -0,0 +1,41 @@
1From db424318d0bb29cbcdf3a07fcc2e023586f1219f Mon Sep 17 00:00:00 2001
2From: Olivier Fourdan <fourdan@xfce.org>
3Date: Fri, 2 Jan 2015 18:50:17 +0100
4Subject: [PATCH] Fix subwindow in Xi emulated events
5
6Bug: 70790
7Upstream status: Submitted
8 https://bugs.freedesktop.org/show_bug.cgi?id=70790
9
10Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
11---
12 Xi/exevents.c | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/Xi/exevents.c b/Xi/exevents.c
16index b0bc47e..0857bce 100644
17--- a/Xi/exevents.c
18+++ b/Xi/exevents.c
19@@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
20
21 if (grab->ownerEvents) {
22 WindowPtr focus = NullWindow;
23- WindowPtr sprite_win = dev->spriteInfo->sprite->win;
24+ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite);
25
26 deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev);
27 }
28@@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
29 }
30 else {
31 GrabPtr devgrab = dev->deviceGrab.grab;
32+ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite);
33
34- DeliverDeviceEvents(win, ptrev, grab, win, dev);
35+ DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev);
36 /* FIXME: bad hack
37 * Implicit passive grab activated in response to this event. Store
38 * the event.
39--
402.1.0
41
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb
index 1519271ccd..7d7d83e97b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb
@@ -4,6 +4,7 @@ require xserver-xorg.inc
4SRC_URI += "file://fix_open_max_preprocessor_error.patch \ 4SRC_URI += "file://fix_open_max_preprocessor_error.patch \
5 file://xorg-CVE-2013-6424.patch \ 5 file://xorg-CVE-2013-6424.patch \
6 file://xshmfence-option.patch \ 6 file://xshmfence-option.patch \
7 file://Fix-subwindow-in-Xi-emulated-events.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "89620960b13515db8d0a8dbb92a1378a" 10SRC_URI[md5sum] = "89620960b13515db8d0a8dbb92a1378a"