Xi: inline ProcXSetDeviceFocus()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-09-17 12:49:09 +02:00 committed by Enrico Weigelt
parent 5330084bd5
commit 302533aac8
3 changed files with 9 additions and 21 deletions

View File

@ -392,7 +392,7 @@ SProcIDispatch(ClientPtr client)
case X_GetDeviceFocus:
return ProcXGetDeviceFocus(client);
case X_SetDeviceFocus:
return SProcXSetDeviceFocus(client);
return ProcXSetDeviceFocus(client);
case X_GetFeedbackControl:
return ProcXGetFeedbackControl(client);
case X_ChangeFeedbackControl:

View File

@ -81,7 +81,6 @@ int SProcXIQueryVersion(ClientPtr client);
int SProcXISelectEvents(ClientPtr client);
int SProcXISetClientPointer(ClientPtr client);
int SProcXIWarpPointer(ClientPtr client);
int SProcXSetDeviceFocus(ClientPtr client);
int SProcXUngrabDeviceButton(ClientPtr client);
int SProcXUngrabDeviceKey(ClientPtr client);

View File

@ -63,22 +63,6 @@ SOFTWARE.
#include "exglobals.h"
/***********************************************************************
*
* This procedure sets the focus for a device.
*
*/
int _X_COLD
SProcXSetDeviceFocus(ClientPtr client)
{
REQUEST(xSetDeviceFocusReq);
REQUEST_SIZE_MATCH(xSetDeviceFocusReq);
swapl(&stuff->focus);
swapl(&stuff->time);
return (ProcXSetDeviceFocus(client));
}
/***********************************************************************
*
* This procedure sets the focus for a device.
@ -88,12 +72,17 @@ SProcXSetDeviceFocus(ClientPtr client)
int
ProcXSetDeviceFocus(ClientPtr client)
{
int ret;
DeviceIntPtr dev;
REQUEST(xSetDeviceFocusReq);
REQUEST_SIZE_MATCH(xSetDeviceFocusReq);
if (client->swapped) {
swapl(&stuff->focus);
swapl(&stuff->time);
}
int ret;
DeviceIntPtr dev;
ret = dixLookupDevice(&dev, stuff->device, client, DixSetFocusAccess);
if (ret != Success)
return ret;