From e8094d8f3f69f45850af031efd79a3928e584638 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 19 Mar 2009 10:09:04 +1000
Subject: [PATCH] dix: ProcSendEvent shouldn't use inputInfo.keyboard directly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/events.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 12a3122ba..b45eb7ba0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4759,7 +4759,9 @@ ProcSendEvent(ClientPtr client)
 {
     WindowPtr pWin;
     WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */
-    SpritePtr pSprite = PickPointer(client)->spriteInfo->sprite;
+    DeviceIntPtr dev = PickPointer(client);
+    DeviceIntPtr keybd = GetPairedDevice(dev);
+    SpritePtr pSprite = dev->spriteInfo->sprite;
     REQUEST(xSendEventReq);
 
     REQUEST_SIZE_MATCH(xSendEventReq);
@@ -4793,7 +4795,7 @@ ProcSendEvent(ClientPtr client)
 	pWin = pSprite->win;
     else if (stuff->destination == InputFocus)
     {
-	WindowPtr inputFocus = inputInfo.keyboard->focus->win;
+	WindowPtr inputFocus = (keybd) ? keybd->focus->win : NoneWin;
 
 	if (inputFocus == NoneWin)
 	    return Success;