File inputproto-2.4.patch of Package inputproto
diff -u -r inputproto-2.3.2/XI2.h inputproto-2.4/XI2.h
--- inputproto-2.3.2/XI2.h 2014-05-29 23:15:03.000000000 +0200
+++ inputproto-2.4/XI2.h 2021-10-28 11:30:52.660668000 +0200
@@ -30,7 +30,7 @@
See commit libXi-1.4.2-21-ge8531dd */
#define XI_2_Major 2
-#define XI_2_Minor 3
+#define XI_2_Minor 4
/* Property event flags */
#define XIPropertyDeleted 0
@@ -85,6 +85,8 @@
#define XIGrabtypeEnter 2
#define XIGrabtypeFocusIn 3
#define XIGrabtypeTouchBegin 4
+#define XIGrabtypeGesturePinchBegin 5
+#define XIGrabtypeGestureSwipeBegin 6
/* Passive grab modifier */
#define XIAnyModifier (1U << 31)
@@ -142,6 +144,7 @@
#define XIValuatorClass 2
#define XIScrollClass 3
#define XITouchClass 8
+#define XIGestureClass 9
/* Scroll class types */
#define XIScrollTypeVertical 1
@@ -164,6 +167,11 @@
#define XIBarrierPointerReleased (1 << 0)
#define XIBarrierDeviceIsGrabbed (1 << 1)
+/* Gesture pinch event flags */
+#define XIGesturePinchEventCancelled (1 << 0)
+
+/* Gesture swipe event flags */
+#define XIGestureSwipeEventCancelled (1 << 0)
/* Touch modes */
#define XIDirectTouch 1
@@ -206,7 +214,13 @@
#define XI_RawTouchEnd 24
#define XI_BarrierHit 25 /* XI 2.3 */
#define XI_BarrierLeave 26
-#define XI_LASTEVENT XI_BarrierLeave
+#define XI_GesturePinchBegin 27 /* XI 2.4 */
+#define XI_GesturePinchUpdate 28
+#define XI_GesturePinchEnd 29
+#define XI_GestureSwipeBegin 30
+#define XI_GestureSwipeUpdate 31
+#define XI_GestureSwipeEnd 32
+#define XI_LASTEVENT XI_GestureSwipeEnd
/* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
* as XI_LASTEVENT if the server is supposed to handle masks etc. for this
* type of event. */
diff -u -r inputproto-2.3.2/XI2proto.h inputproto-2.4/XI2proto.h
--- inputproto-2.3.2/XI2proto.h 2014-08-25 03:09:23.000000000 +0200
+++ inputproto-2.4/XI2proto.h 2021-10-28 11:30:52.664670000 +0200
@@ -44,7 +44,7 @@
* appended to the common structs section before the definition of the
* first request.
* members of structs vertically aligned on column 16 if datatypes permit.
- * otherwise alingned on next available 8n column.
+ * otherwise aligned on next available 8n column.
*/
/**
@@ -149,8 +149,9 @@
/**
* Denotes button capability on a device.
- * Struct is followed by num_buttons * Atom that names the buttons in the
- * device-native setup (i.e. ignoring button mappings).
+ * Struct is followed by a button bit-mask (padded to four byte chunks) and
+ * then num_buttons * Atom that names the buttons in the device-native setup
+ * (i.e. ignoring button mappings).
*/
typedef struct {
uint16_t type; /**< Always ButtonClass */
@@ -218,6 +219,17 @@
} xXITouchInfo;
/**
+ * Denotes touchpad gesture capability on a device.
+ */
+typedef struct {
+ uint16_t type; /**< Always GestureClass */
+ uint16_t length; /**< Length in 4 byte units */
+ uint16_t sourceid; /**< source device for this class */
+ uint8_t num_touches; /**< Maximum number of touches gesture supports (0==unlimited) */
+ uint8_t pad0;
+} xXIGestureInfo;
+
+/**
* Used to select for events on a given window.
* Struct is followed by (mask_len * CARD8), with each bit set representing
* the event mask for the given type. A mask bit represents an event type if
@@ -1082,6 +1094,72 @@
typedef xXIBarrierEvent xXIBarrierPointerReleasedEvent;
typedef xXIBarrierEvent xXIBarrierLeaveEvent;
+/**
+ * Event for touchpad gesture pinch input events
+ */
+typedef struct
+{
+ uint8_t type; /**< Always GenericEvent */
+ uint8_t extension; /**< XI extension offset */
+ uint16_t sequenceNumber;
+ uint32_t length; /**< Length in 4 byte uints */
+ uint16_t evtype;
+ uint16_t deviceid;
+ Time time;
+ uint32_t detail; /**< The number of touches in the gesture */
+ Window root;
+ Window event;
+ Window child;
+/* └──────── 32 byte boundary ────────┘ */
+ FP1616 root_x; /**< Always screen coords, 16.16 fixed point */
+ FP1616 root_y;
+ FP1616 event_x; /**< Always screen coords, 16.16 fixed point */
+ FP1616 event_y;
+ FP1616 delta_x;
+ FP1616 delta_y;
+ FP1616 delta_unaccel_x;
+ FP1616 delta_unaccel_y;
+ FP1616 scale;
+ FP1616 delta_angle;
+ uint16_t sourceid; /**< The source device */
+ uint16_t pad0;
+ xXIModifierInfo mods;
+ xXIGroupInfo group;
+ uint32_t flags; /**< ::XIGesturePinchEventCancelled */
+} xXIGesturePinchEvent;
+
+/**
+ * Event for touchpad gesture swipe input events
+ */
+typedef struct
+{
+ uint8_t type; /**< Always GenericEvent */
+ uint8_t extension; /**< XI extension offset */
+ uint16_t sequenceNumber;
+ uint32_t length; /**< Length in 4 byte uints */
+ uint16_t evtype;
+ uint16_t deviceid;
+ Time time;
+ uint32_t detail; /**< The number of touches in the gesture */
+ Window root;
+ Window event;
+ Window child;
+/* └──────── 32 byte boundary ────────┘ */
+ FP1616 root_x; /**< Always screen coords, 16.16 fixed point */
+ FP1616 root_y;
+ FP1616 event_x; /**< Always screen coords, 16.16 fixed point */
+ FP1616 event_y;
+ FP1616 delta_x;
+ FP1616 delta_y;
+ FP1616 delta_unaccel_x;
+ FP1616 delta_unaccel_y;
+ uint16_t sourceid; /**< The source device */
+ uint16_t pad0;
+ xXIModifierInfo mods;
+ xXIGroupInfo group;
+ uint32_t flags; /**< ::XIGestureSwipeEventCancelled */
+} xXIGestureSwipeEvent;
+
#undef Window
#undef Time
#undef Atom
diff -u -r inputproto-2.3.2/XIproto.h inputproto-2.4/XIproto.h
--- inputproto-2.3.2/XIproto.h 2014-05-29 23:15:03.000000000 +0200
+++ inputproto-2.4/XIproto.h 2021-10-28 11:30:52.669685000 +0200
@@ -177,24 +177,24 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetExtensionVersion */
- CARD16 length B16;
- CARD16 nbytes B16;
+ CARD16 length;
+ CARD16 nbytes;
CARD8 pad1, pad2;
} xGetExtensionVersionReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetExtensionVersion */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 major_version B16;
- CARD16 minor_version B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 major_version;
+ CARD16 minor_version;
BOOL present;
CARD8 pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} xGetExtensionVersionReply;
/*********************************************************
@@ -206,21 +206,21 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_ListInputDevices */
- CARD16 length B16;
+ CARD16 length;
} xListInputDevicesReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_ListInputDevices */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 ndevices;
CARD8 pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xListInputDevicesReply;
typedef struct _xDeviceInfo *xDeviceInfoPtr;
@@ -237,7 +237,7 @@
} xAnyClassInfo;
typedef struct _xDeviceInfo {
- CARD32 type B32;
+ CARD32 type;
CARD8 id;
CARD8 num_classes;
CARD8 use; /* IsXPointer | IsXKeyboard | IsXExtension... */
@@ -255,7 +255,7 @@
CARD8 length;
KeyCode min_keycode;
KeyCode max_keycode;
- CARD16 num_keys B16;
+ CARD16 num_keys;
CARD8 pad1,pad2;
} xKeyInfo;
@@ -268,7 +268,7 @@
CARD8 class;
#endif
CARD8 length;
- CARD16 num_buttons B16;
+ CARD16 num_buttons;
} xButtonInfo;
typedef struct _xValuatorInfo *xValuatorInfoPtr;
@@ -282,15 +282,15 @@
CARD8 length;
CARD8 num_axes;
CARD8 mode;
- CARD32 motion_buffer_size B32;
+ CARD32 motion_buffer_size;
} xValuatorInfo;
typedef struct _xAxisInfo *xAxisInfoPtr;
typedef struct _xAxisInfo {
- CARD32 resolution B32;
- CARD32 min_value B32;
- CARD32 max_value B32;
+ CARD32 resolution;
+ CARD32 min_value;
+ CARD32 max_value;
} xAxisInfo;
/*********************************************************
@@ -302,7 +302,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_OpenDevice */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xOpenDeviceReq;
@@ -310,15 +310,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_OpenDevice */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 num_classes;
BYTE pad1, pad2, pad3;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} xOpenDeviceReply;
typedef struct {
@@ -339,7 +339,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_CloseDevice */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xCloseDeviceReq;
@@ -353,7 +353,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_SetDeviceMode */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 mode;
BYTE pad1, pad2;
@@ -362,15 +362,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_SetDeviceMode */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xSetDeviceModeReply;
/*********************************************************
@@ -382,10 +382,10 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_SelectExtensionEvent */
- CARD16 length B16;
- Window window B32;
- CARD16 count B16;
- CARD16 pad00 B16;
+ CARD16 length;
+ Window window;
+ CARD16 count;
+ CARD16 pad00;
} xSelectExtensionEventReq;
/*********************************************************
@@ -397,22 +397,22 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_GetSelectedExtensionEvents */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xGetSelectedExtensionEventsReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* GetSelectedExtensionEvents */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 this_client_count B16;
- CARD16 all_clients_count B16;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 this_client_count;
+ CARD16 all_clients_count;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xGetSelectedExtensionEventsReply;
/*********************************************************
@@ -424,9 +424,9 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_ChangeDeviceDontPropagateList */
- CARD16 length B16;
- Window window B32;
- CARD16 count B16;
+ CARD16 length;
+ Window window;
+ CARD16 count;
CARD8 mode;
BYTE pad;
} xChangeDeviceDontPropagateListReq;
@@ -440,22 +440,22 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_GetDeviceDontPropagateList */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xGetDeviceDontPropagateListReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* GetDeviceDontPropagateList */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 count B16;
- CARD16 pad00 B16;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 count;
+ CARD16 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xGetDeviceDontPropagateListReply;
/*********************************************************
@@ -467,9 +467,9 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetDeviceMotionEvents*/
- CARD16 length B16;
- Time start B32;
- Time stop B32;
+ CARD16 length;
+ Time start;
+ Time stop;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xGetDeviceMotionEventsReq;
@@ -477,16 +477,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceMotionEvents */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 nEvents B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 nEvents;
CARD8 axes;
CARD8 mode;
BYTE pad1, pad2;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} xGetDeviceMotionEventsReply;
/*********************************************************
@@ -498,7 +498,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_ChangeKeyboardDevice */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xChangeKeyboardDeviceReq;
@@ -506,15 +506,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_ChangeKeyboardDevice*/
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xChangeKeyboardDeviceReply;
/*********************************************************
@@ -526,7 +526,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_ChangePointerDevice */
- CARD16 length B16;
+ CARD16 length;
CARD8 xaxis;
CARD8 yaxis;
CARD8 deviceid;
@@ -536,15 +536,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_ChangePointerDevice */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xChangePointerDeviceReply;
/*********************************************************
@@ -556,29 +556,29 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GrabDevice */
- CARD16 length B16;
- Window grabWindow B32;
- Time time B32;
- CARD16 event_count B16;
+ CARD16 length;
+ Window grabWindow;
+ Time time;
+ CARD16 event_count;
CARD8 this_device_mode;
CARD8 other_devices_mode;
BOOL ownerEvents;
CARD8 deviceid;
- CARD16 pad01 B16;
+ CARD16 pad01;
} xGrabDeviceReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GrabDevice */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xGrabDeviceReply;
/*********************************************************
@@ -590,8 +590,8 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_UnGrabDevice */
- CARD16 length B16;
- Time time B32;
+ CARD16 length;
+ Time time;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xUngrabDeviceReq;
@@ -605,10 +605,10 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GrabDeviceKey */
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 event_count B16;
- CARD16 modifiers B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 event_count;
+ CARD16 modifiers;
CARD8 modifier_device;
CARD8 grabbed_device;
CARD8 key;
@@ -627,9 +627,9 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_UngrabDeviceKey */
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 modifiers B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 modifiers;
CARD8 modifier_device;
CARD8 key;
CARD8 grabbed_device;
@@ -645,12 +645,12 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GrabDeviceButton */
- CARD16 length B16;
- Window grabWindow B32;
+ CARD16 length;
+ Window grabWindow;
CARD8 grabbed_device;
CARD8 modifier_device;
- CARD16 event_count B16;
- CARD16 modifiers B16;
+ CARD16 event_count;
+ CARD16 modifiers;
BYTE this_device_mode;
BYTE other_devices_mode;
CARD8 button;
@@ -667,9 +667,9 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_UngrabDeviceButton */
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 modifiers B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 modifiers;
CARD8 modifier_device;
CARD8 button;
CARD8 grabbed_device;
@@ -685,8 +685,8 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_AllowDeviceEvents */
- CARD16 length B16;
- Time time B32;
+ CARD16 length;
+ Time time;
CARD8 mode;
CARD8 deviceid;
BYTE pad1, pad2;
@@ -701,7 +701,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetDeviceFocus */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xGetDeviceFocusReq;
@@ -709,15 +709,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceFocus */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 focus B32;
- Time time B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 focus;
+ Time time;
CARD8 revertTo;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
} xGetDeviceFocusReply;
/*********************************************************
@@ -729,12 +729,12 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_SetDeviceFocus */
- CARD16 length B16;
- Window focus B32;
- Time time B32;
+ CARD16 length;
+ Window focus;
+ Time time;
CARD8 revertTo;
CARD8 device;
- CARD16 pad01 B16;
+ CARD16 pad01;
} xSetDeviceFocusReq;
/*********************************************************
@@ -746,7 +746,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_GetFeedbackControl */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xGetFeedbackControlReq;
@@ -754,15 +754,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetFeedbackControl */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 num_feedbacks B16;
- CARD16 pad01 B16;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
- CARD32 pad06 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 num_feedbacks;
+ CARD16 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
+ CARD32 pad06;
} xGetFeedbackControlReply;
typedef struct {
@@ -772,7 +772,7 @@
CARD8 class; /* feedback class */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
} xFeedbackState;
typedef struct {
@@ -782,11 +782,11 @@
CARD8 class;
#endif
CARD8 id;
- CARD16 length B16;
- CARD16 pitch B16;
- CARD16 duration B16;
- CARD32 led_mask B32;
- CARD32 led_values B32;
+ CARD16 length;
+ CARD16 pitch;
+ CARD16 duration;
+ CARD32 led_mask;
+ CARD32 led_values;
BOOL global_auto_repeat;
CARD8 click;
CARD8 percent;
@@ -801,11 +801,11 @@
CARD8 class;
#endif
CARD8 id;
- CARD16 length B16;
+ CARD16 length;
CARD8 pad1,pad2;
- CARD16 accelNum B16;
- CARD16 accelDenom B16;
- CARD16 threshold B16;
+ CARD16 accelNum;
+ CARD16 accelDenom;
+ CARD16 threshold;
} xPtrFeedbackState;
typedef struct {
@@ -815,10 +815,10 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id;
- CARD16 length B16; /* feedback length */
- CARD32 resolution B32;
- INT32 min_value B32;
- INT32 max_value B32;
+ CARD16 length; /* feedback length */
+ CARD32 resolution;
+ INT32 min_value;
+ INT32 max_value;
} xIntegerFeedbackState;
typedef struct {
@@ -828,9 +828,9 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id;
- CARD16 length B16; /* feedback length */
- CARD16 max_symbols B16;
- CARD16 num_syms_supported B16;
+ CARD16 length; /* feedback length */
+ CARD16 max_symbols;
+ CARD16 num_syms_supported;
} xStringFeedbackState;
typedef struct {
@@ -840,11 +840,11 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id;
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
CARD8 percent;
BYTE pad1, pad2, pad3;
- CARD16 pitch B16;
- CARD16 duration B16;
+ CARD16 pitch;
+ CARD16 duration;
} xBellFeedbackState;
typedef struct {
@@ -854,9 +854,9 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id;
- CARD16 length B16; /* feedback length */
- CARD32 led_mask B32;
- CARD32 led_values B32;
+ CARD16 length; /* feedback length */
+ CARD32 led_mask;
+ CARD32 led_values;
} xLedFeedbackState;
/*********************************************************
@@ -868,8 +868,8 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_ChangeFeedbackControl */
- CARD16 length B16;
- CARD32 mask B32;
+ CARD16 length;
+ CARD32 mask;
CARD8 deviceid;
CARD8 feedbackid;
BYTE pad1, pad2;
@@ -882,7 +882,7 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
} xFeedbackCtl;
typedef struct {
@@ -892,15 +892,15 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback length */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
KeyCode key;
CARD8 auto_repeat_mode;
INT8 click;
INT8 percent;
- INT16 pitch B16;
- INT16 duration B16;
- CARD32 led_mask B32;
- CARD32 led_values B32;
+ INT16 pitch;
+ INT16 duration;
+ CARD32 led_mask;
+ CARD32 led_values;
} xKbdFeedbackCtl;
typedef struct {
@@ -910,11 +910,11 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
CARD8 pad1,pad2;
- INT16 num B16;
- INT16 denom B16;
- INT16 thresh B16;
+ INT16 num;
+ INT16 denom;
+ INT16 thresh;
} xPtrFeedbackCtl;
typedef struct {
@@ -924,8 +924,8 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
- INT32 int_to_display B32;
+ CARD16 length; /* feedback length */
+ INT32 int_to_display;
} xIntegerFeedbackCtl;
typedef struct {
@@ -935,9 +935,9 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
CARD8 pad1,pad2;
- CARD16 num_keysyms B16;
+ CARD16 num_keysyms;
} xStringFeedbackCtl;
typedef struct {
@@ -947,11 +947,11 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
+ CARD16 length; /* feedback length */
INT8 percent;
BYTE pad1, pad2, pad3;
- INT16 pitch B16;
- INT16 duration B16;
+ INT16 pitch;
+ INT16 duration;
} xBellFeedbackCtl;
typedef struct {
@@ -961,9 +961,9 @@
CARD8 class; /* feedback class id */
#endif
CARD8 id; /* feedback id */
- CARD16 length B16; /* feedback length */
- CARD32 led_mask B32;
- CARD32 led_values B32;
+ CARD16 length; /* feedback length */
+ CARD32 led_mask;
+ CARD32 led_values;
} xLedFeedbackCtl;
/*********************************************************
@@ -975,7 +975,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetDeviceKeyMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
KeyCode firstKeyCode;
CARD8 count;
@@ -985,16 +985,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceKeyMapping */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 keySymsPerKeyCode;
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetDeviceKeyMappingReply;
/*********************************************************
@@ -1006,7 +1006,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_ChangeDeviceKeyMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
KeyCode firstKeyCode;
CARD8 keySymsPerKeyCode;
@@ -1022,7 +1022,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetDeviceModifierMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xGetDeviceModifierMappingReq;
@@ -1030,16 +1030,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceModifierMapping */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 numKeyPerModifier;
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetDeviceModifierMappingReply;
/*********************************************************
@@ -1051,25 +1051,25 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_SetDeviceModifierMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 numKeyPerModifier;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xSetDeviceModifierMappingReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_SetDeviceModifierMapping */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 success;
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xSetDeviceModifierMappingReply;
/*********************************************************
@@ -1081,7 +1081,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_GetDeviceButtonMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xGetDeviceButtonMappingReq;
@@ -1089,15 +1089,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceButtonMapping */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 nElts;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xGetDeviceButtonMappingReply;
/*********************************************************
@@ -1109,7 +1109,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* X_SetDeviceButtonMapping */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 map_length;
BYTE pad1, pad2;
@@ -1118,16 +1118,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_SetDeviceButtonMapping */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 status;
BYTE pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xSetDeviceButtonMappingReply;
/*********************************************************
@@ -1139,7 +1139,7 @@
typedef struct {
CARD8 reqType;
CARD8 ReqType; /* always X_QueryDeviceState */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
BYTE pad1, pad2, pad3;
} xQueryDeviceStateReq;
@@ -1147,16 +1147,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_QueryDeviceState */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 num_classes;
BYTE pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xQueryDeviceStateReply;
typedef struct {
@@ -1205,11 +1205,11 @@
typedef struct {
CARD8 reqType;
CARD8 ReqType; /* always X_SendExtensionEvent */
- CARD16 length B16;
- Window destination B32;
+ CARD16 length;
+ Window destination;
CARD8 deviceid;
BOOL propagate;
- CARD16 count B16;
+ CARD16 count;
CARD8 num_events;
BYTE pad1,pad2,pad3;
} xSendExtensionEventReq;
@@ -1223,7 +1223,7 @@
typedef struct {
CARD8 reqType;
CARD8 ReqType; /* always X_DeviceBell */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 feedbackid;
CARD8 feedbackclass;
@@ -1239,7 +1239,7 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_SetDeviceValuators */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 first_valuator;
CARD8 num_valuators;
@@ -1249,15 +1249,15 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_SetDeviceValuators */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xSetDeviceValuatorsReply;
/*********************************************************
@@ -1269,8 +1269,8 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GetDeviceControl */
- CARD16 length B16;
- CARD16 control B16;
+ CARD16 length;
+ CARD16 control;
CARD8 deviceid;
BYTE pad2;
} xGetDeviceControlReq;
@@ -1278,66 +1278,66 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceControl */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xGetDeviceControlReply;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
} xDeviceState;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
- CARD32 num_valuators B32; /* number of valuators */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
+ CARD32 num_valuators; /* number of valuators */
} xDeviceResolutionState;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
- INT32 min_x B32;
- INT32 max_x B32;
- INT32 min_y B32;
- INT32 max_y B32;
- CARD32 flip_x B32;
- CARD32 flip_y B32;
- CARD32 rotation B32;
- CARD32 button_threshold B32;
+ CARD16 control;
+ CARD16 length;
+ INT32 min_x;
+ INT32 max_x;
+ INT32 min_y;
+ INT32 max_y;
+ CARD32 flip_x;
+ CARD32 flip_y;
+ CARD32 rotation;
+ CARD32 button_threshold;
} xDeviceAbsCalibState;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
- CARD32 offset_x B32;
- CARD32 offset_y B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 screen B32;
- CARD32 following B32;
+ CARD16 control;
+ CARD16 length;
+ CARD32 offset_x;
+ CARD32 offset_y;
+ CARD32 width;
+ CARD32 height;
+ CARD32 screen;
+ CARD32 following;
} xDeviceAbsAreaState;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
CARD8 status;
CARD8 iscore;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDeviceCoreState;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
CARD8 enable;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDeviceEnableState;
/*********************************************************
@@ -1349,8 +1349,8 @@
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_ChangeDeviceControl */
- CARD16 length B16;
- CARD16 control B16;
+ CARD16 length;
+ CARD16 control;
CARD8 deviceid;
BYTE pad0;
} xChangeDeviceControlReq;
@@ -1358,33 +1358,33 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_ChangeDeviceControl */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 status;
BYTE pad1, pad2, pad3;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
} xChangeDeviceControlReply;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
} xDeviceCtl;
typedef struct {
- CARD16 control B16; /* control type */
- CARD16 length B16; /* control length */
+ CARD16 control; /* control type */
+ CARD16 length; /* control length */
CARD8 first_valuator; /* first valuator to change */
CARD8 num_valuators; /* number of valuators to change*/
CARD8 pad1,pad2;
} xDeviceResolutionCtl;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
+ CARD16 control;
+ CARD16 length;
INT32 min_x;
INT32 max_x;
INT32 min_y;
@@ -1396,8 +1396,8 @@
} xDeviceAbsCalibCtl;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
+ CARD16 control;
+ CARD16 length;
CARD32 offset_x;
CARD32 offset_y;
INT32 width;
@@ -1407,19 +1407,19 @@
} xDeviceAbsAreaCtl;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
+ CARD16 control;
+ CARD16 length;
CARD8 status;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDeviceCoreCtl;
typedef struct {
- CARD16 control B16;
- CARD16 length B16;
+ CARD16 control;
+ CARD16 length;
CARD8 enable;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDeviceEnableCtl;
/* XI 1.5 */
@@ -1433,24 +1433,24 @@
typedef struct {
CARD8 reqType; /* input extension major opcode */
CARD8 ReqType; /* always X_ListDeviceProperties */
- CARD16 length B16;
+ CARD16 length;
CARD8 deviceid;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xListDevicePropertiesReq;
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_ListDeviceProperties */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nAtoms B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nAtoms;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xListDevicePropertiesReply;
/*********************************************************
@@ -1462,14 +1462,14 @@
typedef struct {
CARD8 reqType; /* input extension major opcode */
CARD8 ReqType; /* always X_ChangeDeviceProperty */
- CARD16 length B16;
- Atom property B32;
- Atom type B32;
+ CARD16 length;
+ Atom property;
+ Atom type;
CARD8 deviceid;
CARD8 format;
CARD8 mode;
CARD8 pad;
- CARD32 nUnits B32;
+ CARD32 nUnits;
} xChangeDevicePropertyReq;
/*********************************************************
@@ -1481,11 +1481,11 @@
typedef struct {
CARD8 reqType; /* input extension major opcode */
CARD8 ReqType; /* always X_DeleteDeviceProperty */
- CARD16 length B16;
- Atom property B32;
+ CARD16 length;
+ Atom property;
CARD8 deviceid;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDeleteDevicePropertyReq;
/*********************************************************
@@ -1497,11 +1497,11 @@
typedef struct {
CARD8 reqType; /* input extension major opcode */
CARD8 ReqType; /* always X_GetDeviceProperty */
- CARD16 length B16;
- Atom property B32;
- Atom type B32;
- CARD32 longOffset B32;
- CARD32 longLength B32;
+ CARD16 length;
+ Atom property;
+ Atom type;
+ CARD32 longOffset;
+ CARD32 longLength;
CARD8 deviceid;
#if defined(__cplusplus) || defined(c_plusplus)
BOOL c_delete;
@@ -1514,16 +1514,16 @@
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GetDeviceProperty */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom propertyType;
+ CARD32 bytesAfter;
+ CARD32 nItems;
CARD8 format;
CARD8 deviceid;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xGetDevicePropertyReply;
@@ -1539,16 +1539,16 @@
{
BYTE type;
CARD8 deviceid;
- CARD16 sequenceNumber B16;
- KeyButMask device_state B16;
+ CARD16 sequenceNumber;
+ KeyButMask device_state;
CARD8 num_valuators;
CARD8 first_valuator;
- INT32 valuator0 B32;
- INT32 valuator1 B32;
- INT32 valuator2 B32;
- INT32 valuator3 B32;
- INT32 valuator4 B32;
- INT32 valuator5 B32;
+ INT32 valuator0;
+ INT32 valuator1;
+ INT32 valuator2;
+ INT32 valuator3;
+ INT32 valuator4;
+ INT32 valuator5;
} deviceValuator;
/**********************************************************
@@ -1566,16 +1566,16 @@
{
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
- Time time B32;
- Window root B32;
- Window event B32;
- Window child B32;
- INT16 root_x B16;
- INT16 root_y B16;
- INT16 event_x B16;
- INT16 event_y B16;
- KeyButMask state B16;
+ CARD16 sequenceNumber;
+ Time time;
+ Window root;
+ Window event;
+ Window child;
+ INT16 root_x;
+ INT16 root_y;
+ INT16 event_x;
+ INT16 event_y;
+ KeyButMask state;
BOOL same_screen;
CARD8 deviceid;
} deviceKeyButtonPointer;
@@ -1590,16 +1590,16 @@
{
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
- Time time B32;
- Window window B32;
+ CARD16 sequenceNumber;
+ Time time;
+ Window window;
BYTE mode;
CARD8 deviceid;
BYTE pad1, pad2;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
} deviceFocus;
/**********************************************************
@@ -1616,17 +1616,17 @@
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 num_keys;
CARD8 num_buttons;
CARD8 num_valuators;
CARD8 classes_reported;
CARD8 buttons[4];
CARD8 keys[4];
- INT32 valuator0 B32;
- INT32 valuator1 B32;
- INT32 valuator2 B32;
+ INT32 valuator0;
+ INT32 valuator1;
+ INT32 valuator2;
} deviceStateNotify;
/**********************************************************
@@ -1639,7 +1639,7 @@
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 keys[28];
} deviceKeyStateNotify;
@@ -1653,7 +1653,7 @@
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 buttons[28];
} deviceButtonStateNotify;
@@ -1668,17 +1668,17 @@
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 request;
KeyCode firstKeyCode;
CARD8 count;
BYTE pad1;
- Time time B32;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ Time time;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} deviceMappingNotify;
/**********************************************************
@@ -1691,15 +1691,15 @@
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 request;
BYTE pad1, pad2, pad3;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} changeDeviceNotify;
/**********************************************************
@@ -1712,16 +1712,16 @@
{
BYTE type;
BYTE pad00;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
BYTE devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
BYTE deviceid;
- CARD16 control B16;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
- CARD32 pad06 B32;
+ CARD16 control;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
+ CARD32 pad06;
} devicePresenceNotify;
@@ -1736,14 +1736,14 @@
{
BYTE type;
BYTE state; /* NewValue or Deleted */
- CARD16 sequenceNumber B16;
- CARD32 time B32;
- Atom atom B32; /* affected property */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD16 pad5 B16;
+ CARD16 sequenceNumber;
+ CARD32 time;
+ Atom atom; /* affected property */
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD16 pad5;
CARD8 pad4;
CARD8 deviceid; /* id of device */
} devicePropertyNotify;
diff -u -r inputproto-2.3.2/inputproto.pc.in inputproto-2.4/inputproto.pc.in
--- inputproto-2.3.2/inputproto.pc.in 2008-04-16 06:02:05.000000000 +0200
+++ inputproto-2.4/inputproto.pc.in 2021-10-28 11:29:49.843887000 +0200
@@ -1,9 +1,7 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
includedir=@includedir@
Name: InputProto
Description: Input extension headers
-Version: @PACKAGE_VERSION@
+Version: 2.3.99.2
Cflags: -I${includedir}
