mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
xkb: inline SProcXkbSetIndicatorMap()
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
0a7df3a828
commit
89a75202ad
11
xkb/xkb.c
11
xkb/xkb.c
@@ -3273,15 +3273,20 @@ _XkbSetIndicatorMap(ClientPtr client, DeviceIntPtr dev,
|
||||
int
|
||||
ProcXkbSetIndicatorMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbSetIndicatorMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swapl(&stuff->which);
|
||||
}
|
||||
|
||||
int i, bit;
|
||||
int nIndicators;
|
||||
DeviceIntPtr dev;
|
||||
xkbIndicatorMapWireDesc *from;
|
||||
int rc;
|
||||
|
||||
REQUEST(xkbSetIndicatorMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq);
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -129,16 +129,6 @@ SProcXkbSetCompatMap(ClientPtr client)
|
||||
return ProcXkbSetCompatMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetIndicatorMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbSetIndicatorMapReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swapl(&stuff->which);
|
||||
return ProcXkbSetIndicatorMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetKbdByName(ClientPtr client)
|
||||
{
|
||||
@@ -182,7 +172,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbGetIndicatorMap:
|
||||
return ProcXkbGetIndicatorMap(client);
|
||||
case X_kbSetIndicatorMap:
|
||||
return SProcXkbSetIndicatorMap(client);
|
||||
return ProcXkbSetIndicatorMap(client);
|
||||
case X_kbGetNamedIndicator:
|
||||
return ProcXkbGetNamedIndicator(client);
|
||||
case X_kbSetNamedIndicator:
|
||||
|
||||
Reference in New Issue
Block a user