summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-06 11:55:41 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-11 14:37:23 +1000
commit65dbec3d82259bd7bbde5b7a2cdba44727a5606a (patch)
tree851e867cd256a54142d9a12bc0828330bee1ef68 /include
parent13ed59c032b74d106acd08d8893c2708ef5564c5 (diff)
include: Move events up to before function definitions.
Diffstat (limited to 'include')
-rw-r--r--include/X11/extensions/XInput2.h65
1 files changed, 32 insertions, 33 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 0bd51fe..498e0c7 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -116,6 +116,38 @@ typedef struct
XIAnyClassInfo **classes;
} XIDeviceInfo;
+/*
+ * Notifies the client that the device hierarchy has been changed. The client
+ * is expected to re-query the server for the device hierarchy.
+ */
+typedef struct {
+ int type; /* GenericEvent */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came from a SendEvent request */
+ Display *display; /* Display the event was read from */
+ int extension; /* XI extension offset */
+ int evtype; /* XI_DeviceHierarchyChangedNotify */
+ Time time;
+} XDeviceHierarchyChangedEvent;
+
+/*
+ * Notifies the client that the classes have been changed. This happens when
+ * the slave device that sends through the master changes.
+ */
+typedef struct {
+ int type; /* GenericEvent */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came from a SendEvent request */
+ Display *display; /* Display the event was read from */
+ int extension; /* XI extension offset */
+ int evtype; /* XI_DeviceHierarchyChangedNotify */
+ Time time;
+ XID deviceid; /* id of the device that changed */
+ XID slaveid; /* id of the slave device that caused the
+ change */
+ int num_classes;
+ XIAnyClassInfo *inputclassinfo; /* same as in XDeviceInfo */
+} XDeviceClassesChangedEvent;
_XFUNCPROTOBEGIN
@@ -199,37 +231,4 @@ extern void XIFreeDeviceInfo(XIDeviceInfo *info);
_XFUNCPROTOEND
-/*
- * Notifies the client that the device hierarchy has been changed. The client
- * is expected to re-query the server for the device hierarchy.
- */
-typedef struct {
- int type; /* GenericEvent */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- int extension; /* XI extension offset */
- int evtype; /* XI_DeviceHierarchyChangedNotify */
- Time time;
-} XDeviceHierarchyChangedEvent;
-
-/*
- * Notifies the client that the classes have been changed. This happens when
- * the slave device that sends through the master changes.
- */
-typedef struct {
- int type; /* GenericEvent */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- int extension; /* XI extension offset */
- int evtype; /* XI_DeviceHierarchyChangedNotify */
- Time time;
- XID deviceid; /* id of the device that changed */
- XID slaveid; /* id of the slave device that caused the
- change */
- int num_classes;
- XIAnyClassInfo *inputclassinfo; /* same as in XDeviceInfo */
-} XDeviceClassesChangedEvent;
-
#endif /* XINPUT2_H */