dix: inline SProcGrabPointer()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-02 18:44:26 +01:00
committed by Enrico Weigelt
parent a47b2ce91c
commit 7a2a3c9016
4 changed files with 12 additions and 19 deletions

View File

@@ -5007,16 +5007,24 @@ ProcGetInputFocus(ClientPtr client)
int
ProcGrabPointer(ClientPtr client)
{
REQUEST(xGrabPointerReq);
REQUEST_SIZE_MATCH(xGrabPointerReq);
if (client->swapped) {
swapl(&stuff->grabWindow);
swaps(&stuff->eventMask);
swapl(&stuff->confineTo);
swapl(&stuff->cursor);
swapl(&stuff->time);
}
DeviceIntPtr device = PickPointer(client);
GrabPtr grab;
GrabMask mask;
WindowPtr confineTo;
BYTE status;
REQUEST(xGrabPointerReq);
int rc;
REQUEST_SIZE_MATCH(xGrabPointerReq);
UpdateCurrentTime();
if (stuff->eventMask & ~PointerGrabMask) {

View File

@@ -57,8 +57,6 @@ XRetCode SProcGrabKey(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabKeyboard(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcRecolorCursor(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcSetInputFocus(ClientPtr pClient)

View File

@@ -187,19 +187,6 @@ SProcSendEvent(ClientPtr client)
return ((*ProcVector[X_SendEvent]) (client));
}
int _X_COLD
SProcGrabPointer(ClientPtr client)
{
REQUEST(xGrabPointerReq);
REQUEST_SIZE_MATCH(xGrabPointerReq);
swapl(&stuff->grabWindow);
swaps(&stuff->eventMask);
swapl(&stuff->confineTo);
swapl(&stuff->cursor);
swapl(&stuff->time);
return ((*ProcVector[X_GrabPointer]) (client));
}
int _X_COLD
SProcGrabButton(ClientPtr client)
{

View File

@@ -358,7 +358,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
ProcGetSelectionOwner,
SProcConvertSelection,
SProcSendEvent, /* 25 */
SProcGrabPointer,
ProcGrabPointer,
ProcUngrabPointer,
SProcGrabButton,
SProcUngrabButton,