mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
dix: inline SProcGrabPointer()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
a47b2ce91c
commit
7a2a3c9016
14
dix/events.c
14
dix/events.c
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -358,7 +358,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
|
||||
ProcGetSelectionOwner,
|
||||
SProcConvertSelection,
|
||||
SProcSendEvent, /* 25 */
|
||||
SProcGrabPointer,
|
||||
ProcGrabPointer,
|
||||
ProcUngrabPointer,
|
||||
SProcGrabButton,
|
||||
SProcUngrabButton,
|
||||
|
||||
Reference in New Issue
Block a user