mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 01:34:11 +00:00
xkb: inline SProcXkbGetIndicatorMap()
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
175dbe3661
commit
a5796a80f8
11
xkb/xkb.c
11
xkb/xkb.c
@@ -3139,13 +3139,18 @@ XkbAssembleIndicatorMap(ClientPtr client,
|
||||
int
|
||||
ProcXkbGetIndicatorMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbGetIndicatorMapReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swapl(&stuff->which);
|
||||
}
|
||||
|
||||
DeviceIntPtr dev;
|
||||
XkbDescPtr xkb;
|
||||
XkbIndicatorPtr leds;
|
||||
|
||||
REQUEST(xkbGetIndicatorMapReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq);
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -193,16 +193,6 @@ SProcXkbSetCompatMap(ClientPtr client)
|
||||
return ProcXkbSetCompatMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetIndicatorMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbGetIndicatorMapReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swapl(&stuff->which);
|
||||
return ProcXkbGetIndicatorMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetIndicatorMap(ClientPtr client)
|
||||
{
|
||||
@@ -316,7 +306,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbGetIndicatorState:
|
||||
return ProcXkbGetIndicatorState(client);
|
||||
case X_kbGetIndicatorMap:
|
||||
return SProcXkbGetIndicatorMap(client);
|
||||
return ProcXkbGetIndicatorMap(client);
|
||||
case X_kbSetIndicatorMap:
|
||||
return SProcXkbSetIndicatorMap(client);
|
||||
case X_kbGetNamedIndicator:
|
||||
|
||||
Reference in New Issue
Block a user