mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
xkb: inline SProcXkbSetCompatMap()
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:
committed by
Enrico Weigelt
parent
89a75202ad
commit
0c981140cf
12
xkb/xkb.c
12
xkb/xkb.c
@@ -3042,13 +3042,19 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev,
|
||||
int
|
||||
ProcXkbSetCompatMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbSetCompatMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->firstSI);
|
||||
swaps(&stuff->nSI);
|
||||
}
|
||||
|
||||
DeviceIntPtr dev;
|
||||
char *data;
|
||||
int rc;
|
||||
|
||||
REQUEST(xkbSetCompatMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq);
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -118,17 +118,6 @@ SProcXkbSelectEvents(ClientPtr client)
|
||||
return ProcXkbSelectEvents(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetCompatMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbSetCompatMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->firstSI);
|
||||
swaps(&stuff->nSI);
|
||||
return ProcXkbSetCompatMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetKbdByName(ClientPtr client)
|
||||
{
|
||||
@@ -166,7 +155,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbGetCompatMap:
|
||||
return ProcXkbGetCompatMap(client);
|
||||
case X_kbSetCompatMap:
|
||||
return SProcXkbSetCompatMap(client);
|
||||
return ProcXkbSetCompatMap(client);
|
||||
case X_kbGetIndicatorState:
|
||||
return ProcXkbGetIndicatorState(client);
|
||||
case X_kbGetIndicatorMap:
|
||||
|
||||
Reference in New Issue
Block a user