From d4a0bed4b91da9de86c311c7fef9a8aa9a6f500c Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 27 Jul 2019 07:57:27 +0000 Subject: Update to xserver 1.20.5. Tested by jsg@ --- xserver/test/xi2/protocol-xiquerypointer.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'xserver/test/xi2/protocol-xiquerypointer.c') diff --git a/xserver/test/xi2/protocol-xiquerypointer.c b/xserver/test/xi2/protocol-xiquerypointer.c index 2bf18fadc..ed75d7910 100644 --- a/xserver/test/xi2/protocol-xiquerypointer.c +++ b/xserver/test/xi2/protocol-xiquerypointer.c @@ -41,6 +41,7 @@ #include "protocol-common.h" +ClientRec client_window; static ClientRec client_request; static void reply_XIQueryPointer_data(ClientPtr client, int len, char *data, void *closure); @@ -50,26 +51,6 @@ static struct { WindowPtr win; } test_data; -/* dixLookupWindow requires a lot of setup not necessary for this test. - * Simple wrapper that returns either one of the fake root window or the - * fake client window. If the requested ID is neither of those wanted, - * return whatever the real dixLookupWindow does. - */ -int -__wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access) -{ - if (id == root.drawable.id) { - *win = &root; - return Success; - } - else if (id == window.drawable.id) { - *win = &window; - return Success; - } - - return __real_dixLookupWindow(win, id, client, access); -} - static void reply_XIQueryPointer(ClientPtr client, int len, char *data, void *closure) { @@ -209,7 +190,7 @@ test_XIQueryPointer(void) } int -main(int argc, char **argv) +protocol_xiquerypointer_test(void) { init_simple(); -- cgit v1.2.3