diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/extensions/XInput2.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 7fd81c5..43abdb3 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -70,6 +70,27 @@ typedef union { typedef struct { + int base; + int latched; + int locked; +} XIModifierState; + +typedef XIModifierState XIGroupState; + +typedef struct { + int mask_len; + unsigned char *mask; +} XIButtonState; + +typedef struct { + int mask_len; + unsigned char *mask; + double *values; +} XIValuatorState; + + +typedef struct +{ int deviceid; int mask_len; unsigned char* mask; @@ -86,7 +107,8 @@ typedef struct int type; int sourceid; int num_buttons; - Atom *buttons; + Atom *names; + XIButtonState state; } XIButtonClassInfo; typedef struct @@ -186,26 +208,6 @@ typedef struct { XIAnyClassInfo **classes; /* same as in XIDeviceInfo */ } XIDeviceChangedEvent; -typedef struct -{ - int base; - int latched; - int locked; -} XIModifierState; - -typedef XIModifierState XIGroupState; - -typedef struct { - int mask_len; - unsigned char *mask; -} XIButtonState; - -typedef struct { - int mask_len; - unsigned char *mask; - double *values; -} XIValuatorState; - typedef struct { int type; /* GenericEvent */ unsigned long serial; /* # of last request processed by server */ |