summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XI2proto.h2
-rw-r--r--XI2proto.txt14
2 files changed, 8 insertions, 8 deletions
diff --git a/XI2proto.h b/XI2proto.h
index eada483..19ed901 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -202,7 +202,7 @@ typedef struct {
uint16_t length; /**< Length in 4 byte units */
uint16_t sourceid; /**< source device for this class */
uint16_t number; /**< Valuator number */
- Atom name; /**< Valuator name */
+ Atom label; /**< Axis label */
FP3232 min; /**< Min value */
FP3232 max; /**< Max value */
FP3232 value; /**< Last published value */
diff --git a/XI2proto.txt b/XI2proto.txt
index 34f817e..1739849 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -227,7 +227,7 @@ XI2. Clients should ignore this data.
sourceid: CARD16
buttons_len: CARD16
state: SETofBUTTONMASK
- buttons: LISTofATOM }
+ labels: LISTofATOM }
KEYCLASS { type: KeyClass
length: CARD16
@@ -239,7 +239,7 @@ XI2. Clients should ignore this data.
length: CARD16
sourceid: CARD16
axisnumber: CARD16
- axisname: ATOM
+ label: ATOM
min: FP3232
max: FP3232
value: FP3232
@@ -299,9 +299,9 @@ XI2. Clients should ignore this data.
The device this class originates from.
num_buttons
Number of buttons provided by the device.
- buttons
- List of Atoms specifying the type of each button. An atom of None
- specifies an unnamed button. Buttons are listed in the device-native
+ labels
+ List of Atoms specifying the label for each button. An atom of None
+ specifies an unlabeled button. Buttons are listed in the device-native
order and potential button mappings are ignored.
state
The current button mask for this device. Each bit representing a
@@ -331,8 +331,8 @@ XI2. Clients should ignore this data.
axisnumber
Axis number of this axis. The axis number is in device-native
order and potential axis mappings are ignored.
- axisname
- Atom specifying the axis name. An Atom of None specifies an unnamed
+ label
+ Atom specifying the axis name. An Atom of None specifies an unlabeled
axis.
min
Minimum value.