* [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server/files: xorg-server-1.11-dix-send-focus-events.patch xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
@ 2012-01-30 12:38 99% Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 1+ results
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2012-01-30 12:38 UTC (permalink / raw
To: gentoo-commits
chithanh 12/01/30 12:38:52
Added: xorg-server-1.11-dix-send-focus-events.patch
xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
Log:
Version bumps. Include upstream patches to address gtk+:3.3 triggered issues. Raise dependency on xkeyboard-config to avoid security bug #399347.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
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
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
Index: xorg-server-1.11-dix-send-focus-events.patch
===================================================================
From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 05 Jan 2012 12:02:51 +0000
Subject: dix: send focus events to the immediate parent (#44079)
For a transition from windows A to B, A->parent did not receive an event.
DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
window, not it's parent.
X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
---
diff --git a/dix/enterleave.c b/dix/enterleave.c
index a39e640..2b8c7c5 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
NotifyPointer);
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
/* next call catches the root too, if the screen changed */
- DeviceFocusOutEvents(dev, from->parent, NullWindow, mode,
+ DeviceFocusOutEvents(dev, from, NullWindow, mode,
NotifyNonlinearVirtual);
}
/* Notify all the roots */
@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
if (IsParent(to, from))
{
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from);
- DeviceFocusOutEvents(dev, from->parent, to, mode,
+ DeviceFocusOutEvents(dev, from, to, mode,
NotifyVirtual);
DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to);
if ((IsParent(to, sprite->win)) &&
@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
NotifyPointer);
DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
if (from->parent != NullWindow)
- DeviceFocusOutEvents(dev, from->parent, common, mode,
+ DeviceFocusOutEvents(dev, from, common, mode,
NotifyNonlinearVirtual);
if (to->parent != NullWindow)
DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual);
--
cgit v0.9.0.2-2-gbebe
1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
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
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
Index: xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
===================================================================
From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 05 Jan 2012 12:08:01 +0000
Subject: dix: on PointerRootWin send a FocusIn to the sprite window too
XTS XSetDeviceFocus-7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
---
diff --git a/dix/enterleave.c b/dix/enterleave.c
index 2b8c7c5..89a82ab 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev,
for (i = 0; i < nscreens; i++)
DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root);
if (to == PointerRootWin)
+ {
DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer);
+ DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win);
+ }
}
else
{
--
cgit v0.9.0.2-2-gbebe
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-01-30 12:38 99% [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server/files: xorg-server-1.11-dix-send-focus-events.patch xorg-server-1.11-dix-pointerrootwin-send-focusin.patch Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox