Remove superfluous "Device" from protocol requests and events.

Anything with prefix XI is per-device anyway.

3 files changed, 61 insertions, 61 deletions

diff --git a/XI2.h b/XI2.h
index d0b56b8..eeee67f 100644
--- a/XI2.h
+++ b/XI2.h
@@ -63,8 +63,8 @@
 #define XIDeviceDisabled                        (1 << 7)
 
 /* ChangeHierarchy constants */
-#define XICreateMasterDevice                    1
-#define XIRemoveMasterDevice                    2
+#define XICreateMaster                          1
+#define XIRemoveMaster                          2
 #define XIAttachSlave                           3
 #define XIDetachSlave                           4
 
diff --git a/XI2proto.h b/XI2proto.h
index 67502bf..4b808ef 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -52,17 +52,17 @@
  * @addtogroup XI2Requests
  * @{
  */
-#define X_XIQueryDevicePointer          40
-#define X_XIWarpDevicePointer           41
-#define X_XIChangeDeviceCursor          42
-#define X_XIChangeDeviceHierarchy       43
+#define X_XIQueryPointer                40
+#define X_XIWarpPointer                 41
+#define X_XIChangeCursor                42
+#define X_XIChangeHierarchy             43
 #define X_XISetClientPointer            44
 #define X_XIGetClientPointer            45
 #define X_XISelectEvents                46
 #define X_XIQueryVersion                47
 #define X_XIQueryDevice                 48
-#define X_XISetDeviceFocus              49
-#define X_XIGetDeviceFocus              50
+#define X_XISetFocus                    49
+#define X_XIGetFocus                    50
 #define X_XIGrabDevice                  51
 #define X_XIUngrabDevice                52
 #define X_XIAllowEvents                 53
@@ -75,7 +75,7 @@
 /*@}*/
 
 /** Number of XI requests */
-#define XI2REQUESTS (X_XIGetProperty - X_XIQueryDevicePointer + 1)
+#define XI2REQUESTS (X_XIGetProperty - X_XIQueryPointer + 1)
 /** Number of XI2 events */
 #define XI2EVENTS   (XI_LASTEVENT + 1)
 
@@ -192,7 +192,7 @@ typedef struct {
 typedef struct {
     uint16_t    deviceid;       /**< Device id to select for        */
     uint16_t    mask_len;       /**< Length of mask in 4 byte units */
-} xXIDeviceEventMask;
+} xXIEventMask;
 
 
 
@@ -278,24 +278,24 @@ typedef struct {
 
 
 /**
- * @struct xXIQueryDevicePointerReq
+ * @struct xXIQueryPointerReq
  * Query the given device's screen/window coordinates.
  */
 
 typedef struct {
     uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIQueryDevicePointer */
+    uint8_t     ReqType;                /**< Always ::X_XIQueryPointer */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      win;
     uint16_t    deviceid;
     uint16_t    pad1;
-} xXIQueryDevicePointerReq;
-#define sz_xXIQueryDevicePointerReq               12
+} xXIQueryPointerReq;
+#define sz_xXIQueryPointerReq                   12
 
 
 typedef struct {
     uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIQueryDevicePointer */
+    uint8_t     RepType;                /**< Always ::X_XIQueryPointer */
     uint16_t    sequenceNumber;
     uint32_t    length;
     Window      root;
@@ -309,17 +309,17 @@ typedef struct {
     uint8_t     same_screen;
     uint8_t     pad0;
     uint16_t    pad1;
-} xXIQueryDevicePointerReply;
-#define sz_xXIQueryDevicePointerReply             40
+} xXIQueryPointerReply;
+#define sz_xXIQueryPointerReply                 40
 
 /**
- * @struct xXIWarpDevicePointerReq
+ * @struct xXIWarpPointerReq
  * Warp the given device's pointer to the specified position.
  */
 
 typedef struct {
     uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIWarpDevicePointer   */
+    uint8_t     ReqType;                /**< Always ::X_XIWarpPointer   */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      src_win;
     Window      dst_win;
@@ -331,39 +331,39 @@ typedef struct {
     INT16       dst_y;
     uint16_t    deviceid;
     uint16_t    pad1;
-} xXIWarpDevicePointerReq;
-#define sz_xXIWarpDevicePointerReq                28
+} xXIWarpPointerReq;
+#define sz_xXIWarpPointerReq                    28
 
 /**
- * @struct xXIChangeDeviceCursorReq
+ * @struct xXIChangeCursorReq
  * Change the given device's sprite to the given cursor.
  */
 
 typedef struct {
     uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIChangeDeviceCursor  */
+    uint8_t     ReqType;                /**< Always ::X_XIChangeCursor  */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      win;
     Cursor      cursor;
     uint16_t    deviceid;
     uint16_t    pad1;
-} xXIChangeDeviceCursorReq;
-#define sz_xXIChangeDeviceCursorReq               16
+} xXIChangeCursorReq;
+#define sz_xXIChangeCursorReq                           16
 
 /**
- * @struct xXIChangeDeviceHierarchyReq
+ * @struct xXIChangeHierarchyReq
  * Modify the device hierarchy.
  */
 
 typedef struct {
     uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIChangeDeviceHierarchy */
+    uint8_t     ReqType;                /**< Always ::X_XIChangeHierarchy */
     uint16_t    length;                 /**< Length in 4 byte units */
     uint8_t     num_changes;
     uint8_t     pad0;
     uint16_t    pad1;
-} xXIChangeDeviceHierarchyReq;
-#define sz_xXIChangeDeviceHierarchyReq            8
+} xXIChangeHierarchyReq;
+#define sz_xXIChangeHierarchyReq                        8
 
 /**
  * Generic header for any hierarchy change.
@@ -464,19 +464,19 @@ typedef struct {
 #define sz_xXIGetClientPointerReply               32
 
 /**
- * @struct xXISetDeviceFocusReq
+ * @struct xXISetFocusReq
  * Set the input focus to the specified window.
  */
 typedef struct {
     uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XISetDeviceFocus */
+    uint8_t     ReqType;                /**< Always ::X_XISetFocus */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      focus;
     Time        time;
     uint16_t    deviceid;
     uint16_t    pad0;
-} xXISetDeviceFocusReq;
-#define sz_xXISetDeviceFocusReq                 16
+} xXISetFocusReq;
+#define sz_xXISetFocusReq                       16
 
 /**
  * @struct xXIGetDeviceFocusReq
@@ -488,12 +488,12 @@ typedef struct {
     uint16_t    length;                 /**< Length in 4 byte units */
     uint16_t    deviceid;
     uint16_t    pad0;
-} xXIGetDeviceFocusReq;
-#define sz_xXIGetDeviceFocusReq                 8
+} xXIGetFocusReq;
+#define sz_xXIGetFocusReq                       8
 
 typedef struct {
     uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIGetDeviceFocus */
+    uint8_t     RepType;                /**< Always ::X_XIGetFocus */
     uint16_t    sequenceNumber;
     uint32_t    length;
     Window      focus;
@@ -502,8 +502,8 @@ typedef struct {
     uint32_t    pad3;
     uint32_t    pad4;
     uint32_t    pad5;
-} xXIGetDeviceFocusReply;
-#define sz_xXIGetDeviceFocusReply               32
+} xXIGetFocusReply;
+#define sz_xXIGetFocusReply                     32
 
 
 /**
@@ -759,7 +759,7 @@ typedef struct
 } xXIGenericDeviceEvent;
 
 /**
- * @struct xXIDeviceHierarchyEvent
+ * @struct xXIHierarchyEvent
  * The device hierarchy has been modified. This event includes the device
  * hierarchy after the modification has been applied.
  */
@@ -801,7 +801,7 @@ typedef struct
     uint16_t    pad0;
     uint32_t    pad1;
     uint32_t    pad2;
-} xXIDeviceHierarchyEvent;
+} xXIHierarchyEvent;
 
 /**
  * @struct xXIDeviceChangedEvent
@@ -883,7 +883,7 @@ typedef struct
 
 
 /**
- * @struct xXIRawDeviceEvent
+ * @struct xXIRawEvent
  * Sent when an input event is generated. RawEvents include valuator
  * information in both device-specific data (i.e. unaccelerated) and
  * processed data (i.e. accelerated, if applicable).
@@ -905,7 +905,7 @@ typedef struct
                                              mask in 4 byte units */
     uint32_t    pad1;
     uint32_t    pad2;
-} xXIRawDeviceEvent;
+} xXIRawEvent;
 
 /**
  * @struct xXIEnterEvent
diff --git a/XI2proto.txt b/XI2proto.txt
index e4336b6..c23d52c 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -315,13 +315,13 @@ XI2. Clients should ignore this data.
         XISelectEvents
             window:         Window
             num_masks:      CARD16
-            masks:          LISTofDEVICEEVENTMASK
+            masks:          LISTofEVENTMASK
 
     └───
 
-    DEVICEEVENTMASK { deviceid:          DEVICE,
-                      mask_len:          CARD16,
-                      mask:              SETofEVENTMASK
+    EVENTMASK { deviceid:          DEVICE,
+                mask_len:          CARD16,
+                mask:              SETofEVENTMASK
 
     window
         The window to select the events on.
@@ -351,7 +351,7 @@ XI2. Clients should ignore this data.
     If 'mask_len' is 0, the event mask for the given device is cleared.
 
     ┌───
-        XIQueryDevicePointer
+        XIQueryPointer
             window:         Window
             deviceid:       DEVICEID
             ▶
@@ -380,7 +380,7 @@ XI2. Clients should ignore this data.
         TRUE if 'window' is on the same screen as the pointer.
 
     ┌───
-        XIWarpDevicePointer
+        XIWarpPointer
             src_win:         Window
             dst_win:         Window
             src_x:           FP1616
@@ -392,8 +392,8 @@ XI2. Clients should ignore this data.
             deviceid:        DEVICEID
     └───
 
-    WarpDevicePointer moves the pointer of 'deviceid' as if the user had moved
-    the pointer. WarpDevicePointer can only be called for MasterPointer and
+    WarpPointer moves the pointer of 'deviceid' as if the user had moved
+    the pointer. WarpPointer can only be called for MasterPointer and
     FloatingSlave devices.
 
     src_win
@@ -425,7 +425,7 @@ XI2. Clients should ignore this data.
     moved the pointer.
 
     ┌───
-        XIChangeDeviceCursor
+        XIChangeCursor
             win:             Window
             cursor:          Cursor
             deviceid:        DEVICEID
@@ -449,7 +449,7 @@ XI2. Clients should ignore this data.
     - repeat on parent window until a cursor has been found.
 
     ┌───
-        XIChangeDeviceHierarchy
+        XIChangeHierarchy
             num_changes:     CARD8
             changes:         LISTofHIERARCHYCHANGES
     └───
@@ -483,7 +483,7 @@ XI2. Clients should ignore this data.
                   length:     CARD16
                   deviceid:   DEVICEID }
 
-    XIChangeDeviceHierarchy allows a client to modify the MD/SD device
+    XIChangeHierarchy allows a client to modify the MD/SD device
     hierarchy (see Section 4).
 
     num_changes
@@ -586,7 +586,7 @@ XI2. Clients should ignore this data.
         The master pointer that acts as a ClientPointer if 'set' is TRUE.
 
     ┌───
-        XISetDeviceFocus
+        XISetFocus
             focus:           Window
             deviceid:        DEVICEID
             time:            Time
@@ -616,7 +616,7 @@ XI2. Clients should ignore this data.
     Otherwise, the last-focus-change time is set to the specified time.
 
     ┌───
-        XIGetDeviceFocus
+        XIGetFocus
             deviceid:        DEVICEID
             ▶
             focus:           Window
@@ -731,7 +731,7 @@ XI2. Clients should ignore this data.
 
     The request has no effect if the specified time is earlier
     than the last-device-grab time or is later than the current server time.
-    This request generates DeviceFocusIn and DeviceFocusOut events.
+    This request generates FocusIn and FocusOut events.
     An XIUngrabDevice is performed automatically if the event window for an
     active device grab becomes not viewable.
 
@@ -1152,7 +1152,7 @@ EVENTHEADER { type:                       BYTE
 
 
     ┌───
-        DeviceHierarchyEvent:
+        HierarchyEvent:
             EVENTHEADER
             flags:                      SETofHIERARCHYMASK
             num_devices:                CARD16
@@ -1176,7 +1176,7 @@ EVENTHEADER { type:                       BYTE
     devices
         The current hierarchy layout for each device.
 
-    An XDeviceHierarchyEvent is sent whenever the device hierarchy been
+    An XIHierarchyEvent is sent whenever the device hierarchy been
     changed. The 'flags' specify all types of hierarchy modifiations that have
     occured.
     For all devices, 'deviceinfo' details the hierarchy information after the
@@ -1194,7 +1194,7 @@ EVENTHEADER { type:                       BYTE
          device.
 
     Note: Multiple devices may be affected in one hierarchy change,
-    'deviceid' in an XDeviceHierarchyChangedEvent is always the first affected
+    'deviceid' in an XIHierarchyEvent is always the first affected
     device. Clients should ignore deviceid and instead use the 'devices' list.
 
     ┌───
@@ -1263,7 +1263,7 @@ EVENTHEADER { type:                       BYTE
                     latched_group:       CARD8,
                     locked_group:        CARD8 }
 
-    An XDeviceEvent is generated whenever the logical state of a device
+    An XIDeviceEvent is generated whenever the logical state of a device
     changes in response to a button press, a button release, a motion, a key
     press or a key release.
 
@@ -1335,7 +1335,7 @@ EVENTHEADER { type:                       BYTE
     clipping and acceleration.
     Transformed valuator data may be equivalent to raw data. In this case,
     both raw and transformed valuator data is provided.
-    RawDeviceEvents are sent exclusively to all root windows or to the client
+    RawEvents are sent exclusively to all root windows or to the client
     that grabbed the device only.
 
     eventtype