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

xkb: inline SProcXkbSetMap()

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:23:01 +02:00
committed by Enrico Weigelt
parent 24a4dd4606
commit 5330084bd5
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

@@ -2670,13 +2670,22 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
int
ProcXkbSetMap(ClientPtr client)
{
REQUEST(xkbSetMapReq);
REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
if (client->swapped) {
swaps(&stuff->deviceSpec);
swaps(&stuff->present);
swaps(&stuff->flags);
swaps(&stuff->totalSyms);
swaps(&stuff->totalActs);
swaps(&stuff->virtualMods);
}
DeviceIntPtr dev, master;
char *tmp;
int rc;
REQUEST(xkbSetMapReq);
REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess;

16
xkb/xkbSwap.c
View File

@@ -118,20 +118,6 @@ SProcXkbSelectEvents(ClientPtr client)
return ProcXkbSelectEvents(client);
}
static int _X_COLD
SProcXkbSetMap(ClientPtr client)
{
REQUEST(xkbSetMapReq);
REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
swaps(&stuff->deviceSpec);
swaps(&stuff->present);
swaps(&stuff->flags);
swaps(&stuff->totalSyms);
swaps(&stuff->totalActs);
swaps(&stuff->virtualMods);
return ProcXkbSetMap(client);
}
static int _X_COLD
SProcXkbSetCompatMap(ClientPtr client)
{
@@ -207,7 +193,7 @@ SProcXkbDispatch(ClientPtr client)
case X_kbGetMap:
return ProcXkbGetMap(client);
case X_kbSetMap:
return SProcXkbSetMap(client);
return ProcXkbSetMap(client);
case X_kbGetCompatMap:
return ProcXkbGetCompatMap(client);
case X_kbSetCompatMap: