From 1b719f8710087100f800e1e7fc8f3da60bf7ab9a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 25 Sep 2025 13:22:31 +0200
Subject: [PATCH] randr: xinerama: inline byte-swapping into actual request
 handlers

No need to have whole extra functions for just a few LoC, and in the
future the whole thing will become more simplified by generic macros.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 randr/rrxinerama.c | 76 ++++++++++++----------------------------------
 1 file changed, 20 insertions(+), 56 deletions(-)

diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index ecd9d0d72..49eb69a17 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -89,7 +89,6 @@ static int ProcRRXineramaGetScreenCount(ClientPtr client);
 static int ProcRRXineramaGetScreenSize(ClientPtr client);
 static int ProcRRXineramaIsActive(ClientPtr client);
 static int ProcRRXineramaQueryScreens(ClientPtr client);
-static int _X_COLD SProcRRXineramaDispatch(ClientPtr client);
 
 Bool noRRXineramaExtension = FALSE;
 
@@ -115,13 +114,17 @@ int
 ProcRRXineramaGetState(ClientPtr client)
 {
     REQUEST(xPanoramiXGetStateReq);
+    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+
+    if (client->swapped)
+        swapl(&stuff->window);
+
     WindowPtr pWin;
     register int rc;
     ScreenPtr pScreen;
     rrScrPrivPtr pScrPriv;
     Bool active = FALSE;
 
-    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
@@ -159,10 +162,14 @@ int
 ProcRRXineramaGetScreenCount(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenCountReq);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+
+    if (client->swapped)
+        swapl(&stuff->window);
+
     WindowPtr pWin;
     register int rc;
 
-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
@@ -181,11 +188,17 @@ int
 ProcRRXineramaGetScreenSize(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenSizeReq);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+
+    if (client->swapped) {
+        swapl(&stuff->window);
+        swapl(&stuff->screen);
+    }
+
     WindowPtr pWin, pRoot;
     ScreenPtr pScreen;
     register int rc;
 
-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
@@ -284,57 +297,6 @@ ProcRRXineramaDispatch(ClientPtr client)
     return BadRequest;
 }
 
-/* SProc */
-
-static int _X_COLD
-SProcRRXineramaGetState(ClientPtr client)
-{
-    REQUEST(xPanoramiXGetStateReq);
-    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-    swapl(&stuff->window);
-    return ProcRRXineramaGetState(client);
-}
-
-static int _X_COLD
-SProcRRXineramaGetScreenCount(ClientPtr client)
-{
-    REQUEST(xPanoramiXGetScreenCountReq);
-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-    swapl(&stuff->window);
-    return ProcRRXineramaGetScreenCount(client);
-}
-
-static int _X_COLD
-SProcRRXineramaGetScreenSize(ClientPtr client)
-{
-    REQUEST(xPanoramiXGetScreenSizeReq);
-    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-    swapl(&stuff->window);
-    swapl(&stuff->screen);
-    return ProcRRXineramaGetScreenSize(client);
-}
-
-int
-SProcRRXineramaDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-    switch (stuff->data) {
-    case X_PanoramiXQueryVersion:
-        return ProcRRXineramaQueryVersion(client);
-    case X_PanoramiXGetState:
-        return SProcRRXineramaGetState(client);
-    case X_PanoramiXGetScreenCount:
-        return SProcRRXineramaGetScreenCount(client);
-    case X_PanoramiXGetScreenSize:
-        return SProcRRXineramaGetScreenSize(client);
-    case X_XineramaIsActive:
-        return ProcRRXineramaIsActive(client);
-    case X_XineramaQueryScreens:
-        return ProcRRXineramaQueryScreens(client);
-    }
-    return BadRequest;
-}
-
 void
 RRXineramaExtensionInit(void)
 {
@@ -356,5 +318,7 @@ RRXineramaExtensionInit(void)
 
     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
                         ProcRRXineramaDispatch,
-                        SProcRRXineramaDispatch, NULL, StandardMinorOpcode);
+                        ProcRRXineramaDispatch,
+                        NULL,
+                        StandardMinorOpcode);
 }