[PATCH xserver 05/10] Make EventIsDeliverable non-static

[Peter Hutterer]

On Fri, Dec 17, 2010 at 05:13:30PM +0000, Daniel Stone wrote:
> From: Chase Douglas <chase.douglas at canonical.com>
> 
> Will be used outside dix/events.c in proceeding XI 2.1 MT changes.
> 
> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
> Reviewed-by: Daniel Stone <daniel at fooishbar.org>
> ---

merged, thanks.
 
Cheers,
  Peter

>  dix/events.c    |   13 +------------
>  include/input.h |   12 ++++++++++++
>  2 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/dix/events.c b/dix/events.c
> index 8e3e1d3..cb98daf 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -2281,17 +2281,6 @@ FixUpEventFromWindow(
>  }
>  
>  /**
> - * Return masks for EventIsDeliverable.
> - * @defgroup EventIsDeliverable return flags
> - * @{
> - */
> -#define XI_MASK                 (1 << 0) /**< XI mask set on window */
> -#define CORE_MASK               (1 << 1) /**< Core mask set on window */
> -#define DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set on window */
> -#define XI2_MASK                (1 << 3) /**< XI2 mask set on window */
> -/* @} */
> -
> -/**
>   * Check if a given event is deliverable at all on a given window.
>   *
>   * This function only checks if any client wants it, not for a specific
> @@ -2304,7 +2293,7 @@ FixUpEventFromWindow(
>   * @return Bitmask of ::XI2_MASK, ::XI_MASK, ::CORE_MASK, and
>   * ::DONT_PROPAGATE_MASK.
>   */
> -static int
> +int
>  EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
>  {
>      int rc = 0;
> diff --git a/include/input.h b/include/input.h
> index ef7ef04..c1db544 100644
> --- a/include/input.h
> +++ b/include/input.h
> @@ -534,6 +534,18 @@ void FixUpEventFromWindow(SpritePtr pSprite,
>                            Window child,
>                            Bool calcChild);
>  extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
> +extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,
> +                              WindowPtr win);
> +/**
> + * Return masks for EventIsDeliverable.
> + * @defgroup EventIsDeliverable return flags
> + * @{
> + */
> +#define XI_MASK                 (1 << 0) /**< XI mask set on window */
> +#define CORE_MASK               (1 << 1) /**< Core mask set on window */
> +#define DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set on window */
> +#define XI2_MASK                (1 << 3) /**< XI2 mask set on window */
> +/* @} */
>  
>  /* Implemented by the DDX. */
>  extern _X_EXPORT int NewInputDeviceRequest(
> -- 
> 1.7.2.3