From 8753441b3ba4316448e1ae5f408e6a84b0116a3c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 11 Feb 2013 08:02:10 +0100
Subject: xserver mesa git update 11 Feb 2013

xserver          commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa
mesa             commit 990bd49fba7d539e950bdda6eb9819a9abf14850
---
 xorg-server/dix/events.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'xorg-server/dix/events.c')

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);
 
-- 
cgit v1.2.3