[PATCH xserver 09/17] Input: Pass sprite instead of device to XYToWindow, make non-static

[Daniel Stone]

Hi,

On Fri, Dec 31, 2010 at 12:16:40AM +0100, Cyril Brulebois wrote:
> Daniel Stone <daniel at fooishbar.org> (28/12/2010):
> > diff --git a/include/input.h b/include/input.h
> > index a20f8a0..c1db544 100644
> > --- a/include/input.h
> > +++ b/include/input.h
> > @@ -533,6 +533,7 @@ void FixUpEventFromWindow(SpritePtr pSprite,
> >                            WindowPtr pWin,
> >                            Window child,
> >                            Bool calcChild);
> > +extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
> >  extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,
> >                                WindowPtr win);
> >  /**
> 
> Doesn't apply to master cleanly:
> | Applying: Input: Pass sprite instead of device to XYToWindow, make non-static
> | error: patch failed: include/input.h:533
> | error: include/input.h: patch does not apply

Sorry, I should've specified that it's on top of whot/for-keith.  You
need this commit:
http://cgit.freedesktop.org/~daniels/xserver/commit/?h=multitouch&id=495e0142a77152c4cde5c88cdba4103ddc94df2c

which came in the v3 series.

Pulling the tree instead of git am should work fine, just use rebase -i
with s/^pick/edit/ to check the build at every stage.

Thanks though!

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101231/ea419a23/attachment.pgp>