From 5d6d3b56ad38bcafc332444663b25e265f659013 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 23 May 2025 16:08:25 +0200
Subject: [PATCH] dix: unexport DeliverEvents() and fix return type

* not needed by any drivers, so no need to keep it exported
* correct return type is `enum EventDeliveryState`

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/colormap.c |  1 +
 dix/dix_priv.h | 22 ++++++++++++++++++++++
 dix/events.c   |  5 +++--
 dix/property.c |  1 +
 include/dix.h  |  6 ------
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/dix/colormap.c b/dix/colormap.c
index 9a8be28e2..f54c39025 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -53,6 +53,7 @@ SOFTWARE.
 #include <strings.h>
 
 #include "dix/colormap_priv.h"
+#include "dix/dix_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 0465f8dce..dd7c50e89 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -17,6 +17,8 @@
 #include <X11/Xfuncproto.h>
 #include <X11/extensions/XI.h>
 
+#include "dix/input_priv.h"
+
 #include "include/callback.h"
 #include "include/cursor.h"
 #include "include/dix.h"
@@ -456,4 +458,24 @@ int TryClientEvents(ClientPtr pClient,
                     GrabPtr grab)
     _X_ATTRIBUTE_NONNULL_ARG(3);
 
+/**
+ * @brief deliver event to a window and its immediate parent.
+ *
+ * Used for most window events (CreateNotify, ConfigureNotify, etc.).
+ * Not useful for events that propagate up the tree or extension events
+ *
+ * In case of a ReparentNotify event, the event will be delivered to the
+ * otherParent as well.
+ *
+ * @param pWindow       Window to deliver events to.
+ * @param events        Events to deliver.
+ * @param count         number of events in xE.
+ * @param otherParent   Used for ReparentNotify events.
+ */
+enum EventDeliveryState DeliverEvents(WindowPtr pWindow,
+                                      xEventPtr events,
+                                      size_t nEvents,
+                                      WindowPtr otherParent)
+    _X_ATTRIBUTE_NONNULL_ARG(1,2);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/events.c b/dix/events.c
index a9c38b312..7faafd660 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2935,9 +2935,10 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
  * @param xE Events to deliver.
  * @param count number of events in xE.
  * @param otherParent Used for ReparentNotify events.
+ * @return event delivery state (@see enum EventDeliveryState)
  */
-int
-DeliverEvents(WindowPtr pWin, xEvent *xE, int count, WindowPtr otherParent)
+enum EventDeliveryState
+DeliverEvents(WindowPtr pWin, xEvent *xE, size_t count, WindowPtr otherParent)
 {
     DeviceIntRec dummy;
     int deliveries;
diff --git a/dix/property.c b/dix/property.c
index e5e579f95..5e2ddfcf5 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -50,6 +50,7 @@ SOFTWARE.
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
 #include "dix/property_priv.h"
 
 #include "windowstr.h"
diff --git a/include/dix.h b/include/dix.h
index 341174044..699f89848 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -275,12 +275,6 @@ extern _X_EXPORT int
 OtherClientGone(void *value,
                 XID id);
 
-extern _X_EXPORT int
-DeliverEvents(WindowPtr /*pWin */ ,
-              xEventPtr /*xE */ ,
-              int /*count */ ,
-              WindowPtr /*otherParent */ );
-
 extern _X_EXPORT void
 WriteEventsToClient(ClientPtr /*pClient */ ,
                     int /*count */ ,