From bcf399370c07c2a4d172c118ce62613ed6297ada Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Feb 2024 14:35:48 +0100
Subject: [PATCH] (submit/cursor-api) dix: drop superfluous
 XineramaGetCursorScreen()

It's only used for record extension, no external callers, thus doesn't
need to be exported. Since it's just for retrieving one struct value,
it's not needed at all - we can do this directly (just like we do in
many other places)

Note: the check on noPanoramixExtensions is superfluous, since the only
call site already does it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/events.c     | 13 -------------
 include/cursor.h |  6 ------
 record/record.c  | 12 +++++++-----
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 5f65a64e3..8ce868a9a 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1050,19 +1050,6 @@ GetSpritePosition(DeviceIntPtr pDev, int *px, int *py)
     *py = pSprite->hotPhys.y;
 }
 
-#ifdef PANORAMIX
-int
-XineramaGetCursorScreen(DeviceIntPtr pDev)
-{
-    if (!noPanoramiXExtension) {
-        return pDev->spriteInfo->sprite->screen->myNum;
-    }
-    else {
-        return 0;
-    }
-}
-#endif                          /* PANORAMIX */
-
 #define TIMESLOP (5 * 60 * 1000)        /* 5 minutes */
 
 static void
diff --git a/include/cursor.h b/include/cursor.h
index f1edbe1c6..fd003f524 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -57,16 +57,10 @@ SOFTWARE.
 /* Provide support for alpha composited cursors */
 #define ARGB_CURSOR
 
-struct _DeviceIntRec;
-
 typedef struct _Cursor *CursorPtr;
 typedef struct _CursorMetric *CursorMetricPtr;
 
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-#ifdef PANORAMIX
-extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev);
-#endif                          /* PANORAMIX */
-
 #endif                          /* CURSOR_H */
diff --git a/record/record.c b/record/record.c
index e0afcba85..3691fa82c 100644
--- a/record/record.c
+++ b/record/record.c
@@ -36,20 +36,22 @@ and Jim Haggerty of Metheus.
 #include <dix-config.h>
 #endif
 
+#include <stdio.h>
+#include <assert.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/recordproto.h>
+
+#include "dix/cursor_priv.h"
 #include "dix/eventconvert.h"
 #include "miext/extinit_priv.h"
 
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/recordproto.h>
 #include "set.h"
 #include "swaprep.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 
-#include <stdio.h>
-#include <assert.h>
-
 #ifdef PANORAMIX
 #include "globals.h"
 #include "panoramiX.h"
@@ -722,7 +724,7 @@ RecordSendProtocolEvents(RecordClientsAndProtocolPtr pRCAP,
                  pev->u.u.type == ButtonPress ||
                  pev->u.u.type == ButtonRelease ||
                  pev->u.u.type == KeyPress || pev->u.u.type == KeyRelease)) {
-                int scr = XineramaGetCursorScreen(inputInfo.pointer);
+                int scr = inputInfo.pointer->spriteInfo->sprite->screen->myNum;
 
                 memcpy(&shiftedEvent, pev, sizeof(xEvent));
                 shiftedEvent.u.keyButtonPointer.rootX +=