| 1 |
From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001
|
| 2 |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
| 3 |
Date: Thu, 05 Jan 2012 12:02:51 +0000
|
| 4 |
Subject: dix: send focus events to the immediate parent (#44079)
|
| 5 |
|
| 6 |
For a transition from windows A to B, A->parent did not receive an event.
|
| 7 |
DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
|
| 8 |
window, not it's parent.
|
| 9 |
|
| 10 |
X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
|
| 11 |
|
| 12 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
| 13 |
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
|
| 14 |
Reviewed-by: Keith Packard <keithp@keithp.com>
|
| 15 |
---
|
| 16 |
diff --git a/dix/enterleave.c b/dix/enterleave.c
|
| 17 |
index a39e640..2b8c7c5 100644
|
| 18 |
--- a/dix/enterleave.c
|
| 19 |
+++ b/dix/enterleave.c
|
| 20 |
@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
|
| 21 |
NotifyPointer);
|
| 22 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
|
| 23 |
/* next call catches the root too, if the screen changed */
|
| 24 |
- DeviceFocusOutEvents(dev, from->parent, NullWindow, mode,
|
| 25 |
+ DeviceFocusOutEvents(dev, from, NullWindow, mode,
|
| 26 |
NotifyNonlinearVirtual);
|
| 27 |
}
|
| 28 |
/* Notify all the roots */
|
| 29 |
@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
|
| 30 |
if (IsParent(to, from))
|
| 31 |
{
|
| 32 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from);
|
| 33 |
- DeviceFocusOutEvents(dev, from->parent, to, mode,
|
| 34 |
+ DeviceFocusOutEvents(dev, from, to, mode,
|
| 35 |
NotifyVirtual);
|
| 36 |
DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to);
|
| 37 |
if ((IsParent(to, sprite->win)) &&
|
| 38 |
@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
|
| 39 |
NotifyPointer);
|
| 40 |
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
|
| 41 |
if (from->parent != NullWindow)
|
| 42 |
- DeviceFocusOutEvents(dev, from->parent, common, mode,
|
| 43 |
+ DeviceFocusOutEvents(dev, from, common, mode,
|
| 44 |
NotifyNonlinearVirtual);
|
| 45 |
if (to->parent != NullWindow)
|
| 46 |
DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual);
|
| 47 |
--
|
| 48 |
cgit v0.9.0.2-2-gbebe
|
Parent Directory
| 
Revision Log