frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for proper window ID when processing touch allow requests 

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:09 -08:00 committed by Peter Hutterer
parent 9a260e9af8
commit 656ab879f2
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/xiallowev.c
View File

@ -98,7 +98,7 @@ ProcXIAllowEvents(ClientPtr client)
case XIRejectTouch: case XIRejectTouch:
case XIAcceptTouch: case XIAcceptTouch:
ret = TouchAcceptReject(client, dev, stuff->mode, stuff->touchid, ret = TouchAcceptReject(client, dev, stuff->mode, stuff->touchid,
&client->errorValue); stuff->grab_window, &client->errorValue);
break; break;
default: default:
client->errorValue = stuff->mode; client->errorValue = stuff->mode;

18
dix/touch.c
View File

@ -988,7 +988,7 @@ TouchListenerGone(XID resource)
int int
TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
uint32_t touchid, XID *error) uint32_t touchid, Window grab_window, XID *error)
{ {
TouchPointInfoPtr ti; TouchPointInfoPtr ti;
int nev, i; int nev, i;
@ -1003,8 +1003,6 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
return BadDevice; return BadDevice;
} }
/* FIXME window is unhandled */
ti = TouchFindByClientID(dev, touchid); ti = TouchFindByClientID(dev, touchid);
if (!ti) if (!ti)
{ {
@ -1012,9 +1010,17 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
return BadValue; return BadValue;
} }
/* FIXME: Allow for early accept */ for (i = 0; i < ti->num_listeners; i++)
if (ti->num_listeners == 0 || {
CLIENT_ID(ti->listeners[0].listener) != client->index) if (CLIENT_ID(ti->listeners[i].listener) == client->index &&
ti->listeners[i].window->drawable.id == grab_window)
break;
}
if (i == ti->num_listeners)
return BadAccess;
/* FIXME: Implement early accept/reject */
if (i > 0)
return BadAccess; return BadAccess;
nev = GetTouchOwnershipEvents(events, dev, ti, mode, nev = GetTouchOwnershipEvents(events, dev, ti, mode,

2
include/input.h
View File

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