ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xi: inline SProcXIGetClientPointer() and SProcXISetClientPointer()

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-09-25 15:58:27 +02:00 committed by Enrico Weigelt
parent 0293e34b2e
commit 25818f04c3
6 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xi/extinit.c
View File

@ -440,9 +440,9 @@ SProcIDispatch(ClientPtr client)
case X_XIChangeHierarchy:
return ProcXIChangeHierarchy(client);
case X_XISetClientPointer:
return SProcXISetClientPointer(client);
return ProcXISetClientPointer(client);
case X_XIGetClientPointer:
return SProcXIGetClientPointer(client);
return ProcXIGetClientPointer(client);
case X_XISelectEvents:
return SProcXISelectEvents(client);
case X_XIQueryVersion:

2
Xi/handlers.h
View File

@ -69,14 +69,12 @@ int ProcXUngrabDeviceButton(ClientPtr client);
int ProcXUngrabDevice(ClientPtr client);
int ProcXUngrabDeviceKey(ClientPtr client);
int SProcXIGetClientPointer(ClientPtr client);
int SProcXIGetSelectedEvents(ClientPtr client);
int SProcXIPassiveGrabDevice(ClientPtr client);
int SProcXIPassiveUngrabDevice(ClientPtr client);
int SProcXIQueryPointer(ClientPtr client);
int SProcXIQueryVersion(ClientPtr client);
int SProcXISelectEvents(ClientPtr client);
int SProcXISetClientPointer(ClientPtr client);
int SProcXIWarpPointer(ClientPtr client);
#endif /* _XSERVER_XI_HANDLERS_H */

13
Xi/xigetclientpointer.c
View File

@ -46,16 +46,6 @@
* setting.
*/
int _X_COLD
SProcXIGetClientPointer(ClientPtr client)
{
REQUEST(xXIGetClientPointerReq);
REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
swapl(&stuff->win);
return ProcXIGetClientPointer(client);
}
int
ProcXIGetClientPointer(ClientPtr client)
{
@ -65,6 +55,9 @@ ProcXIGetClientPointer(ClientPtr client)
REQUEST(xXIGetClientPointerReq);
REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
if (client->swapped)
swapl(&stuff->win);
if (stuff->win != None) {
rc = dixLookupResourceOwner(&winclient, stuff->win, client, DixGetAttrAccess);

16
Xi/xisetclientpointer.c
View File

@ -47,17 +47,6 @@
#include "exevents.h"
#include "exglobals.h"
int _X_COLD
SProcXISetClientPointer(ClientPtr client)
{
REQUEST(xXISetClientPointerReq);
REQUEST_SIZE_MATCH(xXISetClientPointerReq);
swapl(&stuff->win);
swaps(&stuff->deviceid);
return (ProcXISetClientPointer(client));
}
int
ProcXISetClientPointer(ClientPtr client)
{
@ -68,6 +57,11 @@ ProcXISetClientPointer(ClientPtr client)
REQUEST(xXISetClientPointerReq);
REQUEST_SIZE_MATCH(xXISetClientPointerReq);
if (client->swapped) {
swapl(&stuff->win);
swaps(&stuff->deviceid);
}
rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixManageAccess);
if (rc != Success) {
client->errorValue = stuff->deviceid;

2
test/xi2/protocol-xigetclientpointer.c
View File

@ -93,7 +93,7 @@ request_XIGetClientPointer(ClientPtr client, xXIGetClientPointerReq * req,
client_request.swapped = TRUE;
swapl(&req->win);
swaps(&req->length);
rc = SProcXIGetClientPointer(&client_request);
rc = ProcXIGetClientPointer(&client_request);
assert(rc == error);
if (rc == BadWindow)

2
test/xi2/protocol-xisetclientpointer.c
View File

@ -81,7 +81,7 @@ request_XISetClientPointer(xXISetClientPointerReq * req, int error)
swapl(&req->win);
swaps(&req->deviceid);
rc = SProcXISetClientPointer(&client_request);
rc = ProcXISetClientPointer(&client_request);
assert(rc == error);
if (rc == BadDevice)