summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XI2proto.h4
-rw-r--r--XI2proto.txt14
2 files changed, 9 insertions, 9 deletions
diff --git a/XI2proto.h b/XI2proto.h
index b4c8ace..e147e07 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -843,7 +843,7 @@ typedef struct
*/
/**
- * Device hierarch information.
+ * Device hierarchy information.
*/
typedef struct
{
@@ -875,7 +875,7 @@ typedef struct
::XISlaveAttached, ::XISlaveDetached,
::XISlaveAdded, ::XISlaveRemoved,
::XIDeviceEnabled, ::XIDeviceDisabled */
- uint16_t num_devices;
+ uint16_t num_info;
uint16_t pad0;
uint32_t pad1;
uint32_t pad2;
diff --git a/XI2proto.txt b/XI2proto.txt
index 8dfae7a..492d94f 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -1267,8 +1267,8 @@ EVENTHEADER { type: BYTE
HierarchyEvent:
EVENTHEADER
flags: SETofHIERARCHYMASK
- num_devices: CARD16
- deviceinfo: LISTofHIERARCHYINFO
+ num_info: CARD16
+ info: LISTofHIERARCHYINFO
└───
@@ -1283,15 +1283,15 @@ EVENTHEADER { type: BYTE
flags
Set of the changes that have occured, causing this event.
- num_devices
- The number of devices present in the hierarchy.
- devices
- The current hierarchy layout for each device.
+ num_info
+ The number of device info structs following the request.
+ info:
+ The current hierarchy information.
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
+ For all devices, 'info' details the hierarchy information after the
modification of the hierarchy has occured. For each device specified with
'deviceid':
- if 'type' is MasterPointer or MasterKeyboard, 'attachment' decribes the