From 774da7dfc0902c5f02c2d82f4a54e96b7150c2ee Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 31 Aug 2025 12:27:51 -0700
Subject: [PATCH] Revert "dix: unexport NewCurrentScreen()"

This reverts commit bd3c252710efa8a2446d8110039e6e788b141079.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
---
 Xi/xiwarppointer.c | 1 -
 dix/cursor_priv.h  | 7 -------
 hw/xnest/Events.c  | 1 -
 include/cursor.h   | 5 +++++
 mi/mieq.c          | 1 -
 mi/mipointer.c     | 1 -
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index f4e08abdf..81a1f0522 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -36,7 +36,6 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "mi/mipointer_priv.h"
 
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 21d0e9524..a1f15a5a6 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -10,10 +10,8 @@
 #include <X11/Xdefs.h>
 #include <X11/Xmd.h>
 
-#include "dix/screenint_priv.h"
 #include "include/cursor.h"
 #include "include/dix.h"
-#include "include/input.h"
 #include "include/window.h"
 
 extern CursorPtr rootCursor;
@@ -64,9 +62,4 @@ Bool CursorMetricsFromGlyph(FontPtr pfont,
 
 void CheckCursorConfinement(WindowPtr pWin);
 
-void NewCurrentScreen(DeviceIntPtr pDev,
-                      ScreenPtr newScreen,
-                      int x,
-                      int y);
-
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 0cc0d225d..413206a2d 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -17,7 +17,6 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "dix/cursor_priv.h"
 #include "mi/mi_priv.h"
 
 #include "screenint.h"
diff --git a/include/cursor.h b/include/cursor.h
index d1369d4c8..e8674f7fc 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,11 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
+extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
+                                       ScreenPtr /*newScreen */ ,
+                                       int /*x */ ,
+                                       int /*y */ );
+
 extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */
                                               );
 
diff --git a/mi/mieq.c b/mi/mieq.c
index 852732b98..74d10a314 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -41,7 +41,6 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/extensions/XIproto.h>
 #include   <X11/extensions/geproto.h>
 
-#include   "dix/cursor_priv.h"
 #include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"
diff --git a/mi/mipointer.c b/mi/mipointer.c
index ae5fa6fad..5196b2688 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
 
-#include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
 #include   "mi/mi_priv.h"