From 472e6864967bfc97f92a936168d28a25dae7bf62 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 23 May 2025 16:15:58 +0200
Subject: [PATCH] dix: unexport DeliverEventsToWindow()

Not used by any external drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dix_priv.h | 27 +++++++++++++++++++++++++++
 dix/events.c   |  2 +-
 include/dix.h  |  8 --------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index dd7c50e89..b7089f879 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -478,4 +478,31 @@ enum EventDeliveryState DeliverEvents(WindowPtr pWindow,
                                       WindowPtr otherParent)
     _X_ATTRIBUTE_NONNULL_ARG(1,2);
 
+/**
+ * @brief deliver events to a window.
+ *
+ * At this point, we do not yet know if the event actually needs to be delivered.
+ * May activate a grab if the event is a button press.
+ *
+ * Core events are always delivered to the window owner. If the filter is
+ * something other than CantBeFiltered, the event is also delivered to other
+ * clients with the matching mask on the window.
+ *
+ * More than one event may be delivered at a time. This is the case with
+ * DeviceMotionNotifies which may be followed by DeviceValuator events.
+ *
+ * @param pWindow   The window that would get the event.
+ * @param pEvents   The events to be delivered.
+ * @param count     Number of elements in pEvents.
+ * @param filter    Mask based on event type.
+ * @param grab      Possible grab on the device that caused the event.
+ *
+ * @return a positive number if at least one successful delivery has been
+ * made, 0 if no events were delivered, or a negative number if the event
+ * has not been delivered _and_ rejected by at least one client.
+ */
+int DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWindow, xEventPtr pEvents,
+                          size_t count, Mask filter, GrabPtr grab)
+    _X_ATTRIBUTE_NONNULL_ARG(1,2,3);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/events.c b/dix/events.c
index 7faafd660..ad25ba2e0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2353,7 +2353,7 @@ DeliverEventToWindowMask(DeviceIntPtr dev, WindowPtr win, xEvent *events,
  */
 int
 DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
-                      *pEvents, int count, Mask filter, GrabPtr grab)
+                      *pEvents, size_t count, Mask filter, GrabPtr grab)
 {
     int deliveries = 0, nondeliveries = 0;
     ClientPtr client = NullClient;
diff --git a/include/dix.h b/include/dix.h
index 699f89848..7878cf3c1 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -255,14 +255,6 @@ LastEventTimeToggleResetFlag(int deviceid, Bool state);
 extern _X_EXPORT void
 LastEventTimeToggleResetAll(Bool state);
 
-extern _X_EXPORT int
-DeliverEventsToWindow(DeviceIntPtr /* pWin */ ,
-                      WindowPtr /* pWin */ ,
-                      xEventPtr /* pEvents */ ,
-                      int /* count */ ,
-                      Mask /* filter */ ,
-                      GrabPtr /* grab */ );
-
 extern _X_EXPORT void
 DeliverRawEvent(RawDeviceEvent * /* ev */ ,
                 DeviceIntPtr    /* dev */