From ca35b825a3b9027c1654383df154e4686d796813 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 2 Dec 2025 18:37:39 +0100
Subject: [PATCH] dix: inline SProcLookupColor()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dispatch.c |  7 +++++++
 dix/swapreq.c  | 10 ----------
 dix/swapreq.h  |  1 -
 dix/tables.c   |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 819433eee0..586745a3dd 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3055,6 +3055,13 @@ int
 ProcLookupColor(ClientPtr client)
 {
     REQUEST(xLookupColorReq);
+    REQUEST_AT_LEAST_SIZE(xLookupColorReq);
+
+    if (client->swapped) {
+        swapl(&stuff->cmap);
+        swaps(&stuff->nbytes);
+    }
+
     REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
 
     ColormapPtr pcmp;
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 15a6a7c407..f215972cc3 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -649,16 +649,6 @@ SProcQueryColors(ClientPtr client)
     return ((*ProcVector[X_QueryColors]) (client));
 }
 
-int _X_COLD
-SProcLookupColor(ClientPtr client)
-{
-    REQUEST(xLookupColorReq);
-    REQUEST_AT_LEAST_SIZE(xLookupColorReq);
-    swapl(&stuff->cmap);
-    swaps(&stuff->nbytes);
-    return ((*ProcVector[X_LookupColor]) (client));
-}
-
 int _X_COLD
 SProcCreateCursor(ClientPtr client)
 {
diff --git a/dix/swapreq.h b/dix/swapreq.h
index 8b10d536ed..b4309a85d4 100644
--- a/dix/swapreq.h
+++ b/dix/swapreq.h
@@ -60,7 +60,6 @@ int SProcGetProperty(ClientPtr client);
 int SProcImageText(ClientPtr client);
 int SProcListFonts(ClientPtr client);
 int SProcListFontsWithInfo(ClientPtr client);
-int SProcLookupColor(ClientPtr client);
 int SProcOpenFont(ClientPtr client);
 int SProcPutImage(ClientPtr client);
 int SProcQueryBestSize(ClientPtr client);
diff --git a/dix/tables.c b/dix/tables.c
index 5f1c14b1bd..ad67746c4a 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -424,7 +424,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     SProcStoreColors,
     SProcStoreNamedColor,               /* 90 */
     SProcQueryColors,
-    SProcLookupColor,
+    ProcLookupColor,
     SProcCreateCursor,
     SProcCreateGlyphCursor,
     ProcFreeCursor,                     /* 95 */