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

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>
This commit is contained in:
Chase Douglas 2010-12-17 17:13:30 +00:00 committed by Peter Hutterer
parent 4fbe67beb5
commit 495e0142a7
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/events.c
View File

@ -2289,17 +2289,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. * Check if a given event is deliverable at all on a given window.
* *
@ -2313,7 +2302,7 @@ FixUpEventFromWindow(
* @return Bitmask of ::XI2_MASK, ::XI_MASK, ::CORE_MASK, and * @return Bitmask of ::XI2_MASK, ::XI_MASK, ::CORE_MASK, and
* ::DONT_PROPAGATE_MASK. * ::DONT_PROPAGATE_MASK.
*/ */
static int int
EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win) EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
{ {
int rc = 0; int rc = 0;

12
include/input.h
View File

@ -532,6 +532,18 @@ void FixUpEventFromWindow(DeviceIntPtr pDev,
WindowPtr pWin, WindowPtr pWin,
Window child, Window child,
Bool calcChild); 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. */ /* Implemented by the DDX. */
extern _X_EXPORT int NewInputDeviceRequest( extern _X_EXPORT int NewInputDeviceRequest(