XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xkb: inline SProcXkbGetState()

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 16:50:21 +02:00
committed by Enrico Weigelt
parent 25bd1d3b69
commit d497375eaa
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xkb/xkb.c
View File

@@ -597,11 +597,14 @@ int
ProcXkbGetState(ClientPtr client) ProcXkbGetState(ClientPtr client)
{ {
REQUEST(xkbGetStateReq); REQUEST(xkbGetStateReq);
REQUEST_SIZE_MATCH(xkbGetStateReq);
if (client->swapped)
swaps(&stuff->deviceSpec);
DeviceIntPtr dev; DeviceIntPtr dev;
XkbStateRec *xkb; XkbStateRec *xkb;
REQUEST_SIZE_MATCH(xkbGetStateReq);
if (!(client->xkbClientFlags & _XkbClientInitialized)) if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess; return BadAccess;

11
xkb/xkbSwap.c
View File

@@ -118,15 +118,6 @@ SProcXkbSelectEvents(ClientPtr client)
return ProcXkbSelectEvents(client); return ProcXkbSelectEvents(client);
} }
static int _X_COLD
SProcXkbGetState(ClientPtr client)
{
REQUEST(xkbGetStateReq);
REQUEST_SIZE_MATCH(xkbGetStateReq);
swaps(&stuff->deviceSpec);
return ProcXkbGetState(client);
}
static int _X_COLD static int _X_COLD
SProcXkbLatchLockState(ClientPtr client) SProcXkbLatchLockState(ClientPtr client)
{ {
@@ -243,7 +234,7 @@ SProcXkbDispatch(ClientPtr client)
case X_kbBell: case X_kbBell:
return ProcXkbBell(client); return ProcXkbBell(client);
case X_kbGetState: case X_kbGetState:
return SProcXkbGetState(client); return ProcXkbGetState(client);
case X_kbLatchLockState: case X_kbLatchLockState:
return SProcXkbLatchLockState(client); return SProcXkbLatchLockState(client);
case X_kbGetControls: case X_kbGetControls: