From df2de85c908db2035b7cfdf68143c2607eb454ed Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu, 4 Sep 2008 14:59:10 -0700
Subject: [PATCH] XQuartz: Don't warp the pointer on server start for XQuartz
 (cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)

---
 dix/events.c               |  2 ++
 hw/xquartz/xpr/xprCursor.c | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 2667fef3c..22210af44 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2351,7 +2351,9 @@ DefineInitialRootWindow(WindowPtr win)
 	pScreen, sprite.current, &sprite.hotLimits, &sprite.physLimits);
     sprite.confined = FALSE;
     (*pScreen->ConstrainCursor) (pScreen, &sprite.physLimits);
+#ifndef ROOTLESS
     (*pScreen->SetCursorPosition) (pScreen, sprite.hot.x, sprite.hot.y, FALSE);
+#endif
     (*pScreen->DisplayCursor) (pScreen, sprite.current);
 
 #ifdef PANORAMIX
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 76ab75c02..7088223be 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -293,16 +293,6 @@ QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
 static void
 QuartzWarpCursor(ScreenPtr pScreen, int x, int y)
 {
-    static Bool neverMoved = TRUE;
-
-    if (neverMoved)
-    {
-        /* Don't move the cursor the first time. This is the
-           jump-to-center initialization, and it's annoying. */
-        neverMoved = FALSE;
-        return;
-    }
-
     if (quartzServerVisible)
     {
         int sx, sy;