From a4b61cfc78d81de02a71fa6ad8a44a06616f6794 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 11 Mar 2009 16:08:24 +1000
Subject: [PATCH] dix: un-static FixUpEventFromWindow and deal with focus
 events too.

---
 dix/events.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index adc180bcd..447732ddc 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2233,7 +2233,8 @@ FixUpEventFromWindow(
             event->child = None;
         }
 
-        if (event->evtype == XI_Enter || event->evtype == XI_Leave)
+        if (event->evtype == XI_Enter || event->evtype == XI_Leave ||
+            event->evtype == XI_FocusIn || event->evtype == XI_FocusOut)
             ((xXIEnterEvent*)event)->same_screen =
                 (pSprite->hot.pScreen == pWin->drawable.pScreen);