| 1 |
chithanh 12/01/30 12:38:52 |
| 2 |
|
| 3 |
Added: xorg-server-1.11-dix-send-focus-events.patch |
| 4 |
xorg-server-1.11-dix-pointerrootwin-send-focusin.patch |
| 5 |
Log: |
| 6 |
Version bumps. Include upstream patches to address gtk+:3.3 triggered issues. Raise dependency on xkeyboard-config to avoid security bug #399347. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: xorg-server-1.11-dix-send-focus-events.patch |
| 17 |
=================================================================== |
| 18 |
From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Peter Hutterer <peter.hutterer@×××××.net> |
| 20 |
Date: Thu, 05 Jan 2012 12:02:51 +0000 |
| 21 |
Subject: dix: send focus events to the immediate parent (#44079) |
| 22 |
|
| 23 |
For a transition from windows A to B, A->parent did not receive an event. |
| 24 |
DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual |
| 25 |
window, not it's parent. |
| 26 |
|
| 27 |
X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079> |
| 28 |
|
| 29 |
Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net> |
| 30 |
Reviewed-by: Chase Douglas <chase.douglas@×××××××××.com> |
| 31 |
Reviewed-by: Keith Packard <keithp@××××××.com> |
| 32 |
--- |
| 33 |
diff --git a/dix/enterleave.c b/dix/enterleave.c |
| 34 |
index a39e640..2b8c7c5 100644 |
| 35 |
--- a/dix/enterleave.c |
| 36 |
+++ b/dix/enterleave.c |
| 37 |
@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev, |
| 38 |
NotifyPointer); |
| 39 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from); |
| 40 |
/* next call catches the root too, if the screen changed */ |
| 41 |
- DeviceFocusOutEvents(dev, from->parent, NullWindow, mode, |
| 42 |
+ DeviceFocusOutEvents(dev, from, NullWindow, mode, |
| 43 |
NotifyNonlinearVirtual); |
| 44 |
} |
| 45 |
/* Notify all the roots */ |
| 46 |
@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev, |
| 47 |
if (IsParent(to, from)) |
| 48 |
{ |
| 49 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from); |
| 50 |
- DeviceFocusOutEvents(dev, from->parent, to, mode, |
| 51 |
+ DeviceFocusOutEvents(dev, from, to, mode, |
| 52 |
NotifyVirtual); |
| 53 |
DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to); |
| 54 |
if ((IsParent(to, sprite->win)) && |
| 55 |
@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev, |
| 56 |
NotifyPointer); |
| 57 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from); |
| 58 |
if (from->parent != NullWindow) |
| 59 |
- DeviceFocusOutEvents(dev, from->parent, common, mode, |
| 60 |
+ DeviceFocusOutEvents(dev, from, common, mode, |
| 61 |
NotifyNonlinearVirtual); |
| 62 |
if (to->parent != NullWindow) |
| 63 |
DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual); |
| 64 |
-- |
| 65 |
cgit v0.9.0.2-2-gbebe |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch?rev=1.1&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch?rev=1.1&content-type=text/plain |
| 73 |
|
| 74 |
Index: xorg-server-1.11-dix-pointerrootwin-send-focusin.patch |
| 75 |
=================================================================== |
| 76 |
From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001 |
| 77 |
From: Peter Hutterer <peter.hutterer@×××××.net> |
| 78 |
Date: Thu, 05 Jan 2012 12:08:01 +0000 |
| 79 |
Subject: dix: on PointerRootWin send a FocusIn to the sprite window too |
| 80 |
|
| 81 |
XTS XSetDeviceFocus-7 |
| 82 |
|
| 83 |
Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net> |
| 84 |
Reviewed-by: Chase Douglas <chase.douglas@×××××××××.com> |
| 85 |
--- |
| 86 |
diff --git a/dix/enterleave.c b/dix/enterleave.c |
| 87 |
index 2b8c7c5..89a82ab 100644 |
| 88 |
--- a/dix/enterleave.c |
| 89 |
+++ b/dix/enterleave.c |
| 90 |
@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev, |
| 91 |
for (i = 0; i < nscreens; i++) |
| 92 |
DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root); |
| 93 |
if (to == PointerRootWin) |
| 94 |
+ { |
| 95 |
DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer); |
| 96 |
+ DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win); |
| 97 |
+ } |
| 98 |
} |
| 99 |
else |
| 100 |
{ |
| 101 |
-- |
| 102 |
cgit v0.9.0.2-2-gbebe |
Archives