diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-11 08:02:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-11 08:02:10 +0100 |
| commit | 8753441b3ba4316448e1ae5f408e6a84b0116a3c (patch) | |
| tree | 8defe6bffed265e0846489015877f2384f022e67 /xorg-server/dix/events.c | |
| parent | 212958ab41363d50d87470f6fb47bbcdc7a74c74 (diff) | |
| download | vcxsrv-8753441b3ba4316448e1ae5f408e6a84b0116a3c.tar.gz vcxsrv-8753441b3ba4316448e1ae5f408e6a84b0116a3c.tar.bz2 vcxsrv-8753441b3ba4316448e1ae5f408e6a84b0116a3c.zip | |
xserver mesa git update 11 Feb 2013
xserver commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa
mesa commit 990bd49fba7d539e950bdda6eb9819a9abf14850
Diffstat (limited to 'xorg-server/dix/events.c')
| -rw-r--r-- | xorg-server/dix/events.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index f72cdc7c4..2682ecd46 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -4569,6 +4569,7 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, { GrabPtr grab = mouse->deviceGrab.grab; xXIEnterEvent *event; + WindowPtr focus; int filter; int btlen, len, i; DeviceIntPtr kbd; @@ -4610,6 +4611,11 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, event->group.locked_group = kbd->key->xkbInfo->state.locked_group; } + focus = (kbd) ? kbd->focus->win : None; + if ((focus != NoneWin) && + ((pWin == focus) || (focus == PointerRootWin) || IsParent(focus, pWin))) + event->focus = TRUE; + FixUpEventFromWindow(mouse->spriteInfo->sprite, (xEvent *) event, pWin, None, FALSE); |