From aff4f8979e2a63ff9a2275dd3fd16ee672fecc52 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 16 May 2025 12:27:57 +0200
Subject: [PATCH] randr: move remaining dispatch prototypes to rrdispatch.h

Since we now have a separate header for them, move them all over to there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 randr/randr.c           |  3 ++-
 randr/randrstr_priv.h   | 22 ----------------------
 randr/rrdispatch_priv.h | 17 +++++++++++++++++
 randr/rrlease.c         |  1 +
 randr/rrmonitor.c       |  1 +
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/randr/randr.c b/randr/randr.c
index 56fb453d2..df9ae37f7 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -28,8 +28,9 @@
 
 #include <dix-config.h>
 
-#include "randrstr_priv.h"
 #include "extinit_priv.h"
+#include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
 /* From render.h */
 #ifndef SubPixelUnknown
diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index f50a8eb94..dfbefa48b 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -91,10 +91,6 @@ extern DevPrivateKeyRec RRClientPrivateKeyRec;
 #define GetRRClient(pClient)    ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))
 #define rrClientPriv(pClient)	RRClientPtr pRRClient = GetRRClient(pClient)
 
-int ProcRRGetPanning(ClientPtr client);
-
-int ProcRRSetPanning(ClientPtr client);
-
 void RRConstrainCursorHarder(DeviceIntPtr, ScreenPtr, int, int *, int *);
 
 /* rrlease.c */
@@ -123,22 +119,4 @@ int RRMonitorAdd(ClientPtr client, ScreenPtr screen, RRMonitorPtr monitor);
 
 void RRMonitorFree(RRMonitorPtr monitor);
 
-int ProcRRGetMonitors(ClientPtr client);
-
-int ProcRRSetMonitor(ClientPtr client);
-
-int ProcRRDeleteMonitor(ClientPtr client);
-
-int ProcRRCreateLease(ClientPtr client);
-
-int ProcRRFreeLease(ClientPtr client);
-
-int ProcRRQueryVersion(ClientPtr client);
-
-int ProcRRSelectInput(ClientPtr client);
-
-int ProcRRDispatch(ClientPtr client);
-
-int SProcRRDispatch(ClientPtr client);
-
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */
diff --git a/randr/rrdispatch_priv.h b/randr/rrdispatch_priv.h
index d9b60886b..dc510417c 100644
--- a/randr/rrdispatch_priv.h
+++ b/randr/rrdispatch_priv.h
@@ -55,4 +55,21 @@ int ProcRRConfigureProviderProperty(ClientPtr client);
 int ProcRRChangeProviderProperty(ClientPtr client);
 int ProcRRDeleteProviderProperty(ClientPtr client);
 
+/* monitor related dispatch */
+int ProcRRGetMonitors(ClientPtr client);
+int ProcRRSetMonitor(ClientPtr client);
+int ProcRRDeleteMonitor(ClientPtr client);
+
+int ProcRRGetPanning(ClientPtr client);
+int ProcRRSetPanning(ClientPtr client);
+
+int ProcRRCreateLease(ClientPtr client);
+int ProcRRFreeLease(ClientPtr client);
+
+int ProcRRQueryVersion(ClientPtr client);
+int ProcRRSelectInput(ClientPtr client);
+
+int ProcRRDispatch(ClientPtr client);
+int SProcRRDispatch(ClientPtr client);
+
 #endif /* _XSERVER_RANDR_RRDISPATCH_H */
diff --git a/randr/rrlease.c b/randr/rrlease.c
index e73307807..fec2a9ac5 100644
--- a/randr/rrlease.c
+++ b/randr/rrlease.c
@@ -25,6 +25,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 #include "os/client_priv.h"
 
 #include "swaprep.h"
diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index 661dee32e..b596b50da 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -23,6 +23,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
 #include "swaprep.h"