diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 09:00:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 09:00:32 +1000 |
| commit | a514d16c4535890e5aa2b5835d9a571155830251 (patch) | |
| tree | 8d593ebd379c03c1e040eed0fcb2559d58aaa177 | |
| parent | 099e6f77482e971103570cfd38092c3839f94927 (diff) | |
Axis and button labels should be called labels, not names.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/extensions/XInput2.h | 4 | ||||
| -rw-r--r-- | src/XIQueryDevice.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index c0f8d61..11dd61d 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -107,7 +107,7 @@ typedef struct int type; int sourceid; int num_buttons; - Atom *names; + Atom *labels; XIButtonState state; } XIButtonClassInfo; @@ -124,7 +124,7 @@ typedef struct int type; int sourceid; int number; - Atom name; + Atom label; double min; double max; double value; diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c index e6a4d1b..56774a6 100644 --- a/src/XIQueryDevice.c +++ b/src/XIQueryDevice.c @@ -106,10 +106,10 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) memcpy(cls_lib->state.mask, &cls_wire[1], cls_lib->state.mask_len); - cls_lib->names = (Atom*)((char*)&cls_lib[1] + cls_lib->state.mask_len); + cls_lib->labels = (Atom*)((char*)&cls_lib[1] + cls_lib->state.mask_len); atoms =(uint32_t*)((char*)&cls_wire[1] + cls_lib->state.mask_len); for (j = 0; j < cls_lib->num_buttons; j++) - cls_lib->names[j] = *atoms++; + cls_lib->labels[j] = *atoms++; ptr_lib += sizeof(XIButtonClassInfo); ptr_lib += cls_lib->num_buttons * sizeof(Atom); @@ -142,7 +142,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) cls_wire = (xXIValuatorInfo*)any_wire; cls_lib->number = cls_wire->number; - cls_lib->name = cls_wire->name; + cls_lib->label = cls_wire->label; cls_lib->resolution = cls_wire->resolution; cls_lib->min = cls_wire->min.integral; cls_lib->max = cls_wire->max.integral; |