XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 01:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xi: inline SProcXIQueryVersion()

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:48:21 +02:00
committed by Enrico Weigelt
parent 7d9fb7b4a0
commit 8051613229
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/extinit.c
View File

@@ -446,7 +446,7 @@ SProcIDispatch(ClientPtr client)
case X_XISelectEvents:
return SProcXISelectEvents(client);
case X_XIQueryVersion:
return SProcXIQueryVersion(client);
return ProcXIQueryVersion(client);
case X_XIQueryDevice:
return ProcXIQueryDevice(client);
case X_XISetFocus:

1
Xi/handlers.h
View File

@@ -71,7 +71,6 @@ int ProcXUngrabDeviceKey(ClientPtr client);
int SProcXIGetSelectedEvents(ClientPtr client);
int SProcXIQueryPointer(ClientPtr client);
int SProcXIQueryVersion(ClientPtr client);
int SProcXISelectEvents(ClientPtr client);
int SProcXIWarpPointer(ClientPtr client);

21
Xi/xiqueryversion.c
View File

@@ -56,11 +56,16 @@ extern XExtensionVersion XIVersion; /* defined in getvers.c */
int
ProcXIQueryVersion(ClientPtr client)
{
int major, minor;
REQUEST(xXIQueryVersionReq);
REQUEST_SIZE_MATCH(xXIQueryVersionReq);
if (client->swapped) {
swaps(&stuff->major_version);
swaps(&stuff->minor_version);
}
int major, minor;
/* This request only exists after XI2 */
if (stuff->major_version < 2) {
client->errorValue = stuff->major_version;
@@ -126,15 +131,3 @@ ProcXIQueryVersion(ClientPtr client)
return X_SEND_REPLY_SIMPLE(client, rep);
}
/* Swapping routines */
int _X_COLD
SProcXIQueryVersion(ClientPtr client)
{
REQUEST(xXIQueryVersionReq);
REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
swaps(&stuff->major_version);
swaps(&stuff->minor_version);
return (ProcXIQueryVersion(client));
}

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

@@ -147,7 +147,7 @@ request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error)
swaps(&request.major_version);
swaps(&request.minor_version);
rc = SProcXIQueryVersion(&client);
rc = ProcXIQueryVersion(&client);
assert(rc == error);
}