diff options
| author | Jun Zhu <R01007@freescale.com> | 2015-01-27 11:12:16 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 10:37:52 +0000 |
| commit | e82c9e8098326f2ec070471b7a3daed21cc2cd28 (patch) | |
| tree | 2986b7ad27382e0933bd534b2b8ba189716da902 /meta | |
| parent | 4ef8cc01906833847386fd441d87a89cbdda7e25 (diff) | |
| download | openembedded-core-e82c9e8098326f2ec070471b7a3daed21cc2cd28.tar.gz openembedded-core-e82c9e8098326f2ec070471b7a3daed21cc2cd28.tar.bz2 openembedded-core-e82c9e8098326f2ec070471b7a3daed21cc2cd28.zip | |
xserver-xorg: Add the patch to fix subwindow in Xi emulated events
Signed-off-by: Jun Zhu <R01007@freescale.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb | 1 |
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 @@ +From db424318d0bb29cbcdf3a07fcc2e023586f1219f Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Fri, 2 Jan 2015 18:50:17 +0100 +Subject: [PATCH] Fix subwindow in Xi emulated events + +Bug: 70790 +Upstream status: Submitted + https://bugs.freedesktop.org/show_bug.cgi?id=70790 + +Signed-off-by: Olivier Fourdan <fourdan@xfce.org> +--- + Xi/exevents.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index b0bc47e..0857bce 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + + if (grab->ownerEvents) { + WindowPtr focus = NullWindow; +- WindowPtr sprite_win = dev->spriteInfo->sprite->win; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + + deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev); + } +@@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + } + else { + GrabPtr devgrab = dev->deviceGrab.grab; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + +- DeliverDeviceEvents(win, ptrev, grab, win, dev); ++ DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev); + /* FIXME: bad hack + * Implicit passive grab activated in response to this event. Store + * the event. +-- +2.1.0 + 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 SRC_URI += "file://fix_open_max_preprocessor_error.patch \ file://xorg-CVE-2013-6424.patch \ file://xshmfence-option.patch \ + file://Fix-subwindow-in-Xi-emulated-events.patch \ " SRC_URI[md5sum] = "89620960b13515db8d0a8dbb92a1378a" |