From c53651dabc66aeb9882819a404a799a364f00a29 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Dec 2011 12:57:38 +1000 Subject: [PATCH] dix: move EventDeliveryState into a header file, we'll need it elsewhere Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- dix/events.c | 7 ------- include/input.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dix/events.c b/dix/events.c index 6e015fea2..12c167824 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2014,13 +2014,6 @@ ActivateImplicitGrab(DeviceIntPtr dev, ClientPtr client, WindowPtr win, return TRUE; } -enum EventDeliveryState { - EVENT_DELIVERED, /**< Event has been delivered to a client */ - EVENT_NOT_DELIVERED, /**< Event was not delivered to any client */ - EVENT_SKIP, /**< Event can be discarded by the caller */ - EVENT_REJECTED, /**< Event was rejected for delivery to the client */ -}; - /** * Attempt event delivery to the client owning the window. */ diff --git a/include/input.h b/include/input.h index 917e92f8a..de2a75d62 100644 --- a/include/input.h +++ b/include/input.h @@ -560,6 +560,13 @@ extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, #define EVENT_XI2_MASK (1 << 3) /**< XI2 mask set on window */ /* @} */ +enum EventDeliveryState { + EVENT_DELIVERED, /**< Event has been delivered to a client */ + EVENT_NOT_DELIVERED, /**< Event was not delivered to any client */ + EVENT_SKIP, /**< Event can be discarded by the caller */ + EVENT_REJECTED, /**< Event was rejected for delivery to the client */ +}; + /* Implemented by the DDX. */ extern _X_EXPORT int NewInputDeviceRequest( InputOption *options,