From 3fd183f6373ad0e77aa6db722916551d19abbb59 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 22 May 2025 13:17:03 +0200
Subject: [PATCH] dix: unexport, rename and document GetSpriteCursor()

* not used by any external drivers, so no need to keep it exported
* choose better fitting name: InputDevGetSpriteCursor()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xtest.c               |  2 +-
 dix/events.c               |  2 +-
 dix/input_priv.h           | 12 +++++++++++-
 hw/xquartz/xpr/xprCursor.c |  3 ++-
 include/dixevents.h        |  2 --
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 05ac0e967..11c62252b 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -132,7 +132,7 @@ ProcXTestCompareCursor(ClientPtr client)
     if (stuff->cursor == None)
         pCursor = NullCursor;
     else if (stuff->cursor == XTestCurrentCursor)
-        pCursor = GetSpriteCursor(ptr);
+        pCursor = InputDevGetSpriteCursor(ptr);
     else {
         rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
                                      X11_RESTYPE_CURSOR, client, DixReadAccess);
diff --git a/dix/events.c b/dix/events.c
index 7efdb3275..73706797b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1039,7 +1039,7 @@ GetSpriteWindow(DeviceIntPtr pDev)
  * @return current sprite cursor.
  */
 CursorPtr
-GetSpriteCursor(DeviceIntPtr pDev)
+InputDevGetSpriteCursor(DeviceIntPtr pDev)
 {
     return pDev->spriteInfo->sprite->current;
 }
diff --git a/dix/input_priv.h b/dix/input_priv.h
index 69802e077..5b42a39f6 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -51,7 +51,8 @@ SOFTWARE.
 #ifndef _XSERVER_INPUT_PRIV_H
 #define _XSERVER_INPUT_PRIV_H
 
-#include "input.h"
+#include "include/cursor.h"
+#include "include/input.h"
 
 void InitCoreDevices(void);
 void InitXTestDevices(void);
@@ -361,4 +362,13 @@ int InputThreadRegisterDev(int fd,
 
 int InputThreadUnregisterDev(int fd);
 
+/*
+ * @brief get current sprite cursor for input device
+ *
+ * @param pDev pointer to device structure
+ * @return pointer to device cursor
+ */
+CursorPtr InputDevGetSpriteCursor(DeviceIntPtr pDev)
+    _X_ATTRIBUTE_NONNULL_ARG(1);
+
 #endif /* _XSERVER_INPUT_PRIV_H */
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 5b0ad8a33..2e4da6112 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -38,6 +38,7 @@
 #include "darwinEvents.h"
 #include <Xplugin.h>
 
+#include "dix/input_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include "mi.h"
@@ -400,7 +401,7 @@ QuartzResumeXCursor(ScreenPtr pScreen)
     if (pWin->drawable.pScreen != pScreen)
         return;
 
-    pCursor = GetSpriteCursor(darwinPointer);
+    pCursor = InputDevGetSpriteCursor(darwinPointer);
     if (pCursor == NULL)
         return;
 
diff --git a/include/dixevents.h b/include/dixevents.h
index af389a122..36713a97d 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -26,8 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef DIXEVENTS_H
 #define DIXEVENTS_H
 
-extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev */ );
-
 extern _X_EXPORT int MaybeDeliverEventsToClient(WindowPtr /* pWin */ ,
                                                 xEvent * /* pEvents */ ,
                                                 int /* count */ ,