diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-14 09:46:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-14 09:46:33 +0000 |
| commit | d621ea397a3d181e7a0bf07d72bd21e116fccdb8 (patch) | |
| tree | 051652a7a9f4b063a9362cc712a6e04b4e151de0 /xorg-server/dix/enterleave.c | |
| parent | 2131cbeb6f10b52a48d2ce25cfe27417e173afa5 (diff) | |
| download | vcxsrv-d621ea397a3d181e7a0bf07d72bd21e116fccdb8.tar.gz vcxsrv-d621ea397a3d181e7a0bf07d72bd21e116fccdb8.tar.bz2 vcxsrv-d621ea397a3d181e7a0bf07d72bd21e116fccdb8.zip | |
xserver git update 14/10/2010
Diffstat (limited to 'xorg-server/dix/enterleave.c')
| -rw-r--r-- | xorg-server/dix/enterleave.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xorg-server/dix/enterleave.c b/xorg-server/dix/enterleave.c index 417aa2639..6be14190f 100644 --- a/xorg-server/dix/enterleave.c +++ b/xorg-server/dix/enterleave.c @@ -1251,11 +1251,6 @@ CoreFocusEvents(DeviceIntPtr dev, SetFocusIn(dev, to);
}
-/**
- * The root window the given device is currently on.
- */
-#define RootWindow(dev) dev->spriteInfo->sprite->spriteTrace[0]
-
static void
DeviceFocusEvents(DeviceIntPtr dev,
WindowPtr from,
@@ -1284,7 +1279,7 @@ DeviceFocusEvents(DeviceIntPtr dev, if ((from == NullWindow) || (from == PointerRootWin))
{
if (from == PointerRootWin)
- DeviceFocusOutEvents(dev, sprite->win, RootWindow(dev), mode,
+ DeviceFocusOutEvents(dev, sprite->win, GetCurrentRootWindow(dev), mode,
NotifyPointer);
/* Notify all the roots */
for (i = 0; i < nscreens; i++)
@@ -1304,19 +1299,19 @@ DeviceFocusEvents(DeviceIntPtr dev, for (i = 0; i < nscreens; i++)
DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root);
if (to == PointerRootWin)
- DeviceFocusInEvents(dev, RootWindow(dev), sprite->win, mode, NotifyPointer);
+ DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer);
}
else
{
if ((from == NullWindow) || (from == PointerRootWin))
{
if (from == PointerRootWin)
- DeviceFocusOutEvents(dev, sprite->win, RootWindow(dev), mode,
+ DeviceFocusOutEvents(dev, sprite->win, GetCurrentRootWindow(dev), mode,
NotifyPointer);
for (i = 0; i < nscreens; i++)
DeviceFocusEvent(dev, XI_FocusOut, mode, out, screenInfo.screens[i]->root);
if (to->parent != NullWindow)
- DeviceFocusInEvents(dev, RootWindow(dev), to, mode, NotifyNonlinearVirtual);
+ DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), to, mode, NotifyNonlinearVirtual);
DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyNonlinear, to);
if (IsParent(to, sprite->win))
DeviceFocusInEvents(dev, to, sprite->win, mode, NotifyPointer);
|