andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move AllowTouch to dix/touch.c, and rename to TouchAcceptReject

Browse Source 
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas 2012-02-03 16:19:08 -08:00 committed by Peter Hutterer
parent 192b2c9a2e
commit 9a260e9af8
3 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Xi/xiallowev.c
View File

@ -57,47 +57,6 @@ SProcXIAllowEvents(ClientPtr client)
return ProcXIAllowEvents(client);
}
static int
AllowTouch(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, XID *error)
{
TouchPointInfoPtr ti;
int nev, i;
InternalEvent *events = InitEventList(GetMaximumEventsNum());
if (!events)
return BadAlloc;
if (!dev->touch)
{
*error = dev->id;
return BadDevice;
}
/* FIXME window is unhandled */
ti = TouchFindByClientID(dev, touchid);
if (!ti)
{
*error = touchid;
return BadValue;
}
/* FIXME: Allow for early accept */
if (ti->num_listeners == 0 || CLIENT_ID(ti->listeners[0].listener) != client->index)
return BadAccess;
nev = GetTouchOwnershipEvents(events, dev, ti, mode, ti->listeners[0].listener, 0);
if (nev == 0)
return BadAlloc;
for (i = 0; i < nev; i++)
mieqProcessDeviceEvent(dev, events + i, NULL);
ProcessInputEvents();
FreeEventList(events, GetMaximumEventsNum());
return Success;
}
int
ProcXIAllowEvents(ClientPtr client)
{
@ -138,9 +97,8 @@ ProcXIAllowEvents(ClientPtr client)
break;
case XIRejectTouch:
case XIAcceptTouch:
ret = AllowTouch(client, dev,
stuff->mode, stuff->touchid,
&client->errorValue);
ret = TouchAcceptReject(client, dev, stuff->mode, stuff->touchid,
&client->errorValue);
break;
default:
client->errorValue = stuff->mode;

45
dix/touch.c
View File

@ -34,6 +34,7 @@
#include "eventstr.h"
#include "exevents.h"
#include "exglobals.h"
#include "inpututils.h"
#include "eventconvert.h"
#include "windowstr.h"
@ -984,3 +985,47 @@ TouchListenerGone(XID resource)
FreeEventList(events, GetMaximumEventsNum());
}
int
TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
uint32_t touchid, XID *error)
{
TouchPointInfoPtr ti;
int nev, i;
InternalEvent *events = InitEventList(GetMaximumEventsNum());
if (!events)
return BadAlloc;
if (!dev->touch)
{
*error = dev->id;
return BadDevice;
}
/* FIXME window is unhandled */
ti = TouchFindByClientID(dev, touchid);
if (!ti)
{
*error = touchid;
return BadValue;
}
/* FIXME: Allow for early accept */
if (ti->num_listeners == 0 ||
CLIENT_ID(ti->listeners[0].listener) != client->index)
return BadAccess;
nev = GetTouchOwnershipEvents(events, dev, ti, mode,
ti->listeners[0].listener, 0);
if (nev == 0)
return BadAlloc;
for (i = 0; i < nev; i++)
mieqProcessDeviceEvent(dev, events + i, NULL);
ProcessInputEvents();
FreeEventList(events, GetMaximumEventsNum());
return Success;
}

2
include/input.h
View File

@ -625,6 +625,8 @@ extern int TouchConvertToPointerEvent(const InternalEvent *ev,
extern int TouchGetPointerEventType(const InternalEvent *ev);
extern void TouchRemovePointerGrab(DeviceIntPtr dev);
extern void TouchListenerGone(XID resource);
extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
uint32_t touchid, XID *error);
/* misc event helpers */
extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);