Rename XICreateMaster to XIAddMaster for consistency.

We use add/remove for slave devices, add/remove for the hierarchy changed
flags, so let's use add/remove to create a new device as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

3 files changed, 13 insertions, 13 deletions

diff --git a/XI2.h b/XI2.h
index 1347762..1ec2d44 100644
--- a/XI2.h
+++ b/XI2.h
@@ -84,7 +84,7 @@
 #define XIDeviceDisabled                        (1 << 7)
 
 /* ChangeHierarchy constants */
-#define XICreateMaster                          1
+#define XIAddMaster                             1
 #define XIRemoveMaster                          2
 #define XIAttachSlave                           3
 #define XIDetachSlave                           4
diff --git a/XI2proto.h b/XI2proto.h
index 5ec377a..b4c8ace 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -456,12 +456,12 @@ typedef struct {
  * Name of new master follows struct (4-byte padded)
  */
 typedef struct {
-    uint16_t    type;                   /**< Always ::XICreateMaster */
+    uint16_t    type;                   /**< Always ::XIAddMaster */
     uint16_t    length;                 /**< 2 + (namelen + padding)/4 */
     uint16_t    name_len;
     uint8_t     send_core;
     uint8_t     enable;
-} xXICreateMasterInfo;
+} xXIAddMasterInfo;
 
 /**
  * Delete a master device. Will automatically delete the master device paired
diff --git a/XI2proto.txt b/XI2proto.txt
index f0b3861..8dfae7a 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -510,18 +510,18 @@ XI2. Clients should ignore this data.
             changes:         LISTofHIERARCHYCHANGES
     └───
 
-    HIERARCHYCHANGE { CREATEMASTER, REMOVEMASTER, ATTACHSLAVE, DETACHSLAVE }
+    HIERARCHYCHANGE { ADDMASTER, REMOVEMASTER, ATTACHSLAVE, DETACHSLAVE }
 
-    HIERARCHYCHANGETYPE { CreateMaster, RemoveMaster, AttachSlave, DetachSlave }
+    HIERARCHYCHANGETYPE { AddMaster, RemoveMaster, AttachSlave, DetachSlave }
 
     CHANGEMODE { Float, Attach }
 
-    CREATEMASTER { type:        HIERARCHYCHANGETYPE
-                   length:      CARD16
-                   name_len:    CARD16
-                   send_core:   BOOL
-                   enable:      BOOL
-                   name:        LISTofCHAR8 }
+    ADDMASTER { type:        HIERARCHYCHANGETYPE
+                length:      CARD16
+                name_len:    CARD16
+                send_core:   BOOL
+                enable:      BOOL
+                name:        LISTofCHAR8 }
 
     REMOVEMASTER { type:            HIERARCHYCHANGETYPE
                    length:          CARD16
@@ -551,9 +551,9 @@ XI2. Clients should ignore this data.
     immediately. If an error occurs, processing stops at the current change
     and returns the number of successfully applied changes in the error.
 
-    CREATEMASTER creates a pair of master devices.
+    ADDMASTER creates a pair of master devices.
     type
-        Always CreateMaster.
+        Always AddMaster.
     length
         Length in 4 byte units.
     name_len