mirror of
https://github.com/X11Libre/xserver.git
synced 2026-01-26 14:03:17 +00:00
Xi: inline SProcXAllowDeviceEvents()
No need to have a hole bunch of extra functions, if we can just easily inline the few relevant lines. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
08d60b4083
commit
c2a2ce1d7e
24
Xi/allowev.c
24
Xi/allowev.c
@ -60,21 +60,6 @@ SOFTWARE.
|
||||
#include "dix/input_priv.h"
|
||||
#include "Xi/handlers.h"
|
||||
|
||||
/***********************************************************************
|
||||
*
|
||||
* This procedure allows frozen events to be routed.
|
||||
*
|
||||
*/
|
||||
|
||||
int _X_COLD
|
||||
SProcXAllowDeviceEvents(ClientPtr client)
|
||||
{
|
||||
REQUEST(xAllowDeviceEventsReq);
|
||||
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
|
||||
swapl(&stuff->time);
|
||||
return (ProcXAllowDeviceEvents(client));
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
*
|
||||
* This procedure allows frozen events to be routed.
|
||||
@ -84,13 +69,16 @@ SProcXAllowDeviceEvents(ClientPtr client)
|
||||
int
|
||||
ProcXAllowDeviceEvents(ClientPtr client)
|
||||
{
|
||||
REQUEST(xAllowDeviceEventsReq);
|
||||
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
|
||||
|
||||
if (client->swapped)
|
||||
swapl(&stuff->time);
|
||||
|
||||
TimeStamp time;
|
||||
DeviceIntPtr thisdev;
|
||||
int rc;
|
||||
|
||||
REQUEST(xAllowDeviceEventsReq);
|
||||
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
|
||||
|
||||
rc = dixLookupDevice(&thisdev, stuff->deviceid, client, DixGetAttrAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
@ -388,7 +388,7 @@ SProcIDispatch(ClientPtr client)
|
||||
case X_UngrabDeviceButton:
|
||||
return SProcXUngrabDeviceButton(client);
|
||||
case X_AllowDeviceEvents:
|
||||
return SProcXAllowDeviceEvents(client);
|
||||
return ProcXAllowDeviceEvents(client);
|
||||
case X_GetDeviceFocus:
|
||||
return ProcXGetDeviceFocus(client);
|
||||
case X_SetDeviceFocus:
|
||||
|
||||
@ -69,7 +69,6 @@ int ProcXUngrabDeviceButton(ClientPtr client);
|
||||
int ProcXUngrabDevice(ClientPtr client);
|
||||
int ProcXUngrabDeviceKey(ClientPtr client);
|
||||
|
||||
int SProcXAllowDeviceEvents(ClientPtr client);
|
||||
int SProcXChangeDeviceControl(ClientPtr client);
|
||||
int SProcXChangeDeviceDontPropagateList(ClientPtr client);
|
||||
int SProcXChangeDeviceProperty(ClientPtr client);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user