From a4794aa1681ae4de71d92d5804923c55cf953dcd Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Wed, 19 Nov 2008 13:51:34 -0500
Subject: [PATCH] Fix device grabbing when xinerama is disabled.

---
 hw/dmx/dmxgrab.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/hw/dmx/dmxgrab.c b/hw/dmx/dmxgrab.c
index ef29d7e06..297ea3193 100644
--- a/hw/dmx/dmxgrab.c
+++ b/hw/dmx/dmxgrab.c
@@ -79,8 +79,12 @@ dmxGrabKeyboard (DeviceIntPtr pDev,
 	}
 	else
 #endif
+
+	{
+	    pWin = pGrab->window;
 	    if (i != pWin->drawable.pScreen->myNum)
 		continue;
+	}
 
 	dmxInputGrabKeyboard (&dmxScreen->input, pDev, pWin);
     }
@@ -125,8 +129,12 @@ dmxUngrabKeyboard (DeviceIntPtr pDev,
 	}
 	else
 #endif
+
+	{
+	    pWin = pGrab->window;
 	    if (i != pWin->drawable.pScreen->myNum)
 		continue;
+	}
 
 	dmxInputUngrabKeyboard (&dmxScreen->input, pDev, pWin);
     }
@@ -212,8 +220,12 @@ dmxGrabPointer (DeviceIntPtr pDev,
 	}
 	else
 #endif
+
+	{
+	    pWin = pGrab->window;
 	    if (i != pWin->drawable.pScreen->myNum)
 		continue;
+	}
 
 	dmxInputGrabPointer (&dmxScreen->input,
 			     pDev,
@@ -262,8 +274,12 @@ dmxUngrabPointer (DeviceIntPtr pDev,
 	}
 	else
 #endif
+
+	{
+	    pWin = pGrab->window;
 	    if (i != pWin->drawable.pScreen->myNum)
 		continue;
+	}
 
 	dmxInputUngrabPointer (&dmxScreen->input, pDev, pWin);
     }