From 091c8182133a380d68bac79c393cdffd1a5a0960 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 11 Jul 2024 16:48:16 +0200
Subject: [PATCH] test: Xi: make sure client swapped flag is reset

Some test cases are recycling the ClientRec between swapped/unwapped runs.
Make sure the Client's swapped flag is always reset in those cases.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 test/xi2/protocol-xigetclientpointer.c  | 2 +-
 test/xi2/protocol-xipassivegrabdevice.c | 1 +
 test/xi2/protocol-xiquerypointer.c      | 1 +
 test/xi2/protocol-xiwarppointer.c       | 3 +--
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c
index f01199e84..ca33ec184 100644
--- a/test/xi2/protocol-xigetclientpointer.c
+++ b/test/xi2/protocol-xigetclientpointer.c
@@ -81,6 +81,7 @@ request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq * req,
 
     test_data.win = req->win;
 
+    client_request.swapped = FALSE;
     rc = ProcXIGetClientPointer(&client_request);
     assert(rc == error);
 
@@ -95,7 +96,6 @@ request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq * req,
 
     if (rc == BadWindow)
         assert(client_request.errorValue == req->win);
-
 }
 
 static void
diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c
index 18413a853..f794faf5c 100644
--- a/test/xi2/protocol-xipassivegrabdevice.c
+++ b/test/xi2/protocol-xipassivegrabdevice.c
@@ -137,6 +137,7 @@ request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq * req,
     int mask_len;
 
     client_request.req_len = req->length;
+    client_request.swapped = FALSE;
     rc = ProcXIPassiveGrabDevice(&client_request);
     assert(rc == error);
 
diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
index 8a7ae608b..99933483c 100644
--- a/test/xi2/protocol-xiquerypointer.c
+++ b/test/xi2/protocol-xiquerypointer.c
@@ -120,6 +120,7 @@ request_XIQueryPointer(ClientPtr client, xXIQueryPointerReq * req, int error)
 {
     int rc;
 
+    client_request.swapped = FALSE;
     rc = ProcXIQueryPointer(&client_request);
     assert(rc == error);
 
diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c
index d225e79ed..680a94cf2 100644
--- a/test/xi2/protocol-xiwarppointer.c
+++ b/test/xi2/protocol-xiwarppointer.c
@@ -64,6 +64,7 @@ request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq * req, int error)
 {
     int rc;
 
+    client->swapped = FALSE;
     rc = ProcXIWarpPointer(client);
     assert(rc == error);
 
@@ -93,8 +94,6 @@ request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq * req, int error)
     else if (rc == BadWindow)
         assert(client->errorValue == req->dst_win ||
                client->errorValue == req->src_win);
-
-    client->swapped = FALSE;
 }
 
 static void