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

[Cyril Brulebois]

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

Context in master:
| void FixUpEventFromWindow(SpritePtr pSprite,
|                           xEvent *xE,
|                           WindowPtr pWin,
|                           Window child,
|                           Bool calcChild);
| 
| /* Implemented by the DDX. */

KiBi.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101231/9c737255/attachment.pgp>