diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2010-12-17 17:13:30 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:36:44 +0000 |
| commit | 47818287983b04625661b08ae362e0966cddf3e1 (patch) | |
| tree | d3c50ccb1bc9c27b8463d6020dc78e810c203c31 | |
| parent | f7d8ade3c5ac44faf7f3ea0d846e35f75b31c9ec (diff) | |
Make EventIsDeliverable non-static
Will be used outside dix/events.c in proceeding XI 2.1 MT changes.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/events.c | 13 | ||||
| -rw-r--r-- | include/input.h | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/dix/events.c b/dix/events.c index 4e2dd89da..f280f9d7a 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2290,17 +2290,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 @@ -2313,7 +2302,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 fef69a1fa..9f3227fb0 100644 --- a/include/input.h +++ b/include/input.h @@ -532,6 +532,18 @@ void FixUpEventFromWindow(DeviceIntPtr pDev, WindowPtr pWin, Window child, Bool calcChild); +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( |