From 829595da02c81fb04c78183dcb18417faee9dda1 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 25 Sep 2025 15:55:34 +0200
Subject: [PATCH] Xi: inline SProcXIGetFocus() and SProcXISetFocus()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xi/extinit.c       |  4 ++--
 Xi/handlers.h      |  2 --
 Xi/xisetdevfocus.c | 33 +++++++++------------------------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/Xi/extinit.c b/Xi/extinit.c
index bb168a2c75..3899ace507 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -450,9 +450,9 @@ SProcIDispatch(ClientPtr client)
         case X_XIQueryDevice:
             return SProcXIQueryDevice(client);
         case X_XISetFocus:
-            return SProcXISetFocus(client);
+            return ProcXISetFocus(client);
         case X_XIGetFocus:
-            return SProcXIGetFocus(client);
+            return ProcXIGetFocus(client);
         case X_XIGrabDevice:
             return ProcXIGrabDevice(client);
         case X_XIUngrabDevice:
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 558ba85538..8a5ea8790c 100644
--- a/Xi/handlers.h
+++ b/Xi/handlers.h
@@ -77,7 +77,6 @@ int SProcXGrabDeviceButton(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 int SProcXIBarrierReleasePointer(ClientPtr client);
 int SProcXIGetClientPointer(ClientPtr client);
-int SProcXIGetFocus(ClientPtr client);
 int SProcXIGetSelectedEvents(ClientPtr client);
 int SProcXIPassiveGrabDevice(ClientPtr client);
 int SProcXIPassiveUngrabDevice(ClientPtr client);
@@ -86,7 +85,6 @@ int SProcXIQueryPointer(ClientPtr client);
 int SProcXIQueryVersion(ClientPtr client);
 int SProcXISelectEvents(ClientPtr client);
 int SProcXISetClientPointer(ClientPtr client);
-int SProcXISetFocus(ClientPtr client);
 int SProcXIWarpPointer(ClientPtr client);
 int SProcXSetDeviceFocus(ClientPtr client);
 int SProcXUngrabDeviceButton(ClientPtr client);
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
index 22dfd711ce..51698eb8cc 100644
--- a/Xi/xisetdevfocus.c
+++ b/Xi/xisetdevfocus.c
@@ -41,30 +41,6 @@
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"          /* BadDevice */
 
-int _X_COLD
-SProcXISetFocus(ClientPtr client)
-{
-    REQUEST(xXISetFocusReq);
-    REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
-
-    swaps(&stuff->deviceid);
-    swapl(&stuff->focus);
-    swapl(&stuff->time);
-
-    return ProcXISetFocus(client);
-}
-
-int _X_COLD
-SProcXIGetFocus(ClientPtr client)
-{
-    REQUEST(xXIGetFocusReq);
-    REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
-
-    swaps(&stuff->deviceid);
-
-    return ProcXIGetFocus(client);
-}
-
 int
 ProcXISetFocus(ClientPtr client)
 {
@@ -74,6 +50,12 @@ ProcXISetFocus(ClientPtr client)
     REQUEST(xXISetFocusReq);
     REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
 
+    if (client->swapped) {
+        swaps(&stuff->deviceid);
+        swapl(&stuff->focus);
+        swapl(&stuff->time);
+    }
+
     ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
     if (ret != Success)
         return ret;
@@ -93,6 +75,9 @@ ProcXIGetFocus(ClientPtr client)
     REQUEST(xXIGetFocusReq);
     REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
 
+    if (client->swapped)
+        swaps(&stuff->deviceid);
+
     ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess);
     if (ret != Success)
         return ret;