mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
xkb: inline SProcXkbBell()
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
8d100100af
commit
8daa5bc8b9
14
xkb/xkb.c
14
xkb/xkb.c
@@ -493,12 +493,22 @@ int
|
||||
ProcXkbBell(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbBellReq);
|
||||
REQUEST_SIZE_MATCH(xkbBellReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->bellClass);
|
||||
swaps(&stuff->bellID);
|
||||
swapl(&stuff->name);
|
||||
swapl(&stuff->window);
|
||||
swaps(&stuff->pitch);
|
||||
swaps(&stuff->duration);
|
||||
}
|
||||
|
||||
DeviceIntPtr dev;
|
||||
WindowPtr pWin;
|
||||
int rc;
|
||||
|
||||
REQUEST_SIZE_MATCH(xkbBellReq);
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -128,21 +128,6 @@ SProcXkbSelectEvents(ClientPtr client)
|
||||
return ProcXkbSelectEvents(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbBell(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbBellReq);
|
||||
REQUEST_SIZE_MATCH(xkbBellReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->bellClass);
|
||||
swaps(&stuff->bellID);
|
||||
swapl(&stuff->name);
|
||||
swapl(&stuff->window);
|
||||
swaps(&stuff->pitch);
|
||||
swaps(&stuff->duration);
|
||||
return ProcXkbBell(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetState(ClientPtr client)
|
||||
{
|
||||
@@ -321,7 +306,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbSelectEvents:
|
||||
return SProcXkbSelectEvents(client);
|
||||
case X_kbBell:
|
||||
return SProcXkbBell(client);
|
||||
return ProcXkbBell(client);
|
||||
case X_kbGetState:
|
||||
return SProcXkbGetState(client);
|
||||
case X_kbLatchLockState:
|
||||
|
||||
Reference in New Issue
Block a user