summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-12-06 12:57:38 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-12-13 13:24:00 +1000
commitc53651dabc66aeb9882819a404a799a364f00a29 (patch)
treefd5dfc78bc5ed22c4067b2eafd80fa420bdadebb
parent86c3137c81e924bacd919e9d65809e07afeabbff (diff)
dix: move EventDeliveryState into a header file, we'll need it elsewhere
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--dix/events.c7
-rw-r--r--include/input.h7
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,