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

xkb: inline SProcXkbGetGeometry()

Browse Source 
No need to have whole extra functions for just a few LoC.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-24 17:25:14 +02:00
committed by Enrico Weigelt
parent 335dd555fe
commit 2d71f0579f
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xkb/xkb.c
View File

@@ -4843,14 +4843,19 @@ XkbAssembleGeometry(ClientPtr client,
int
ProcXkbGetGeometry(ClientPtr client)
{
REQUEST(xkbGetGeometryReq);
REQUEST_SIZE_MATCH(xkbGetGeometryReq);
if (client->swapped) {
swaps(&stuff->deviceSpec);
swapl(&stuff->name);
}
DeviceIntPtr dev;
XkbGeometryPtr geom;
Bool shouldFree;
Status status;
REQUEST(xkbGetGeometryReq);
REQUEST_SIZE_MATCH(xkbGetGeometryReq);
if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess;

12
xkb/xkbSwap.c
View File

@@ -139,16 +139,6 @@ SProcXkbSetIndicatorMap(ClientPtr client)
return ProcXkbSetIndicatorMap(client);
}
static int _X_COLD
SProcXkbGetGeometry(ClientPtr client)
{
REQUEST(xkbGetGeometryReq);
REQUEST_SIZE_MATCH(xkbGetGeometryReq);
swaps(&stuff->deviceSpec);
swapl(&stuff->name);
return ProcXkbGetGeometry(client);
}
static int _X_COLD
SProcXkbGetKbdByName(ClientPtr client)
{
@@ -202,7 +192,7 @@ SProcXkbDispatch(ClientPtr client)
case X_kbSetNames:
return ProcXkbSetNames(client);
case X_kbGetGeometry:
return SProcXkbGetGeometry(client);
return ProcXkbGetGeometry(client);
case X_kbSetGeometry:
return ProcXkbSetGeometry(client);
case X_kbPerClientFlags: