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 SProcXkbSetNamedIndicator()

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:11:09 +02:00
committed by Enrico Weigelt
parent a5796a80f8
commit 3e9c40015f
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xkb/xkb.c
View File

@@ -3499,14 +3499,23 @@ _XkbSetNamedIndicator(ClientPtr client, DeviceIntPtr dev,
int
ProcXkbSetNamedIndicator(ClientPtr client)
{
REQUEST(xkbSetNamedIndicatorReq);
REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq);
if (client->swapped) {
swaps(&stuff->deviceSpec);
swaps(&stuff->ledClass);
swaps(&stuff->ledID);
swapl(&stuff->indicator);
swaps(&stuff->virtualMods);
swapl(&stuff->ctrls);
}
int rc;
DeviceIntPtr dev;
int led = 0;
XkbIndicatorMapPtr map;
REQUEST(xkbSetNamedIndicatorReq);
REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq);
if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess;

16
xkb/xkbSwap.c
View File

@@ -203,20 +203,6 @@ SProcXkbSetIndicatorMap(ClientPtr client)
return ProcXkbSetIndicatorMap(client);
}
static int _X_COLD
SProcXkbSetNamedIndicator(ClientPtr client)
{
REQUEST(xkbSetNamedIndicatorReq);
REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq);
swaps(&stuff->deviceSpec);
swaps(&stuff->ledClass);
swaps(&stuff->ledID);
swapl(&stuff->indicator);
swaps(&stuff->virtualMods);
swapl(&stuff->ctrls);
return ProcXkbSetNamedIndicator(client);
}
static int _X_COLD
SProcXkbGetGeometry(ClientPtr client)
{
@@ -312,7 +298,7 @@ SProcXkbDispatch(ClientPtr client)
case X_kbGetNamedIndicator:
return ProcXkbGetNamedIndicator(client);
case X_kbSetNamedIndicator:
return SProcXkbSetNamedIndicator(client);
return ProcXkbSetNamedIndicator(client);
case X_kbGetNames:
return ProcXkbGetNames(client);
case X_kbSetNames: