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

Xi: inline SProcXIGetFocus() and SProcXISetFocus()

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-25 15:55:34 +02:00
committed by Enrico Weigelt
parent 338f8c0b06
commit 829595da02
3 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Xi/extinit.c
View File

@@ -450,9 +450,9 @@ SProcIDispatch(ClientPtr client)
case X_XIQueryDevice:
return SProcXIQueryDevice(client);
case X_XISetFocus:
return SProcXISetFocus(client);
return ProcXISetFocus(client);
case X_XIGetFocus:
return SProcXIGetFocus(client);
return ProcXIGetFocus(client);
case X_XIGrabDevice:
return ProcXIGrabDevice(client);
case X_XIUngrabDevice:

2
Xi/handlers.h
View File

@@ -77,7 +77,6 @@ int SProcXGrabDeviceButton(ClientPtr client);
int SProcXIAllowEvents(ClientPtr client);
int SProcXIBarrierReleasePointer(ClientPtr client);
int SProcXIGetClientPointer(ClientPtr client);
int SProcXIGetFocus(ClientPtr client);
int SProcXIGetSelectedEvents(ClientPtr client);
int SProcXIPassiveGrabDevice(ClientPtr client);
int SProcXIPassiveUngrabDevice(ClientPtr client);
@@ -86,7 +85,6 @@ int SProcXIQueryPointer(ClientPtr client);
int SProcXIQueryVersion(ClientPtr client);
int SProcXISelectEvents(ClientPtr client);
int SProcXISetClientPointer(ClientPtr client);
int SProcXISetFocus(ClientPtr client);
int SProcXIWarpPointer(ClientPtr client);
int SProcXSetDeviceFocus(ClientPtr client);
int SProcXUngrabDeviceButton(ClientPtr client);

33
Xi/xisetdevfocus.c
View File

@@ -41,30 +41,6 @@
#include "windowstr.h" /* window structure */
#include "exglobals.h" /* BadDevice */
int _X_COLD
SProcXISetFocus(ClientPtr client)
{
REQUEST(xXISetFocusReq);
REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
swaps(&stuff->deviceid);
swapl(&stuff->focus);
swapl(&stuff->time);
return ProcXISetFocus(client);
}
int _X_COLD
SProcXIGetFocus(ClientPtr client)
{
REQUEST(xXIGetFocusReq);
REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
swaps(&stuff->deviceid);
return ProcXIGetFocus(client);
}
int
ProcXISetFocus(ClientPtr client)
{
@@ -74,6 +50,12 @@ ProcXISetFocus(ClientPtr client)
REQUEST(xXISetFocusReq);
REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
if (client->swapped) {
swaps(&stuff->deviceid);
swapl(&stuff->focus);
swapl(&stuff->time);
}
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
if (ret != Success)
return ret;
@@ -93,6 +75,9 @@ ProcXIGetFocus(ClientPtr client)
REQUEST(xXIGetFocusReq);
REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
if (client->swapped)
swaps(&stuff->deviceid);
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess);
if (ret != Success)
return ret;