wok-current view xorg-inputproto/stuff/inputproto-2.4.patch @ rev 25693
Up depends pkgs for cups, need to rebuild it for ssl 3.0
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Sun Mar 24 15:17:37 2024 +0000 (3 months ago) |
| parents | |
| children |
line source
1 diff -u -r inputproto-2.3.2/XI2.h inputproto-2.4/XI2.h
2 --- inputproto-2.3.2/XI2.h 2014-05-29 23:15:03.000000000 +0200
3 +++ inputproto-2.4/XI2.h 2021-10-28 11:30:52.660668000 +0200
4 @@ -30,7 +30,7 @@
5 See commit libXi-1.4.2-21-ge8531dd */
7 #define XI_2_Major 2
8 -#define XI_2_Minor 3
9 +#define XI_2_Minor 4
11 /* Property event flags */
12 #define XIPropertyDeleted 0
13 @@ -85,6 +85,8 @@
14 #define XIGrabtypeEnter 2
15 #define XIGrabtypeFocusIn 3
16 #define XIGrabtypeTouchBegin 4
17 +#define XIGrabtypeGesturePinchBegin 5
18 +#define XIGrabtypeGestureSwipeBegin 6
20 /* Passive grab modifier */
21 #define XIAnyModifier (1U << 31)
22 @@ -142,6 +144,7 @@
23 #define XIValuatorClass 2
24 #define XIScrollClass 3
25 #define XITouchClass 8
26 +#define XIGestureClass 9
28 /* Scroll class types */
29 #define XIScrollTypeVertical 1
30 @@ -164,6 +167,11 @@
31 #define XIBarrierPointerReleased (1 << 0)
32 #define XIBarrierDeviceIsGrabbed (1 << 1)
34 +/* Gesture pinch event flags */
35 +#define XIGesturePinchEventCancelled (1 << 0)
36 +
37 +/* Gesture swipe event flags */
38 +#define XIGestureSwipeEventCancelled (1 << 0)
40 /* Touch modes */
41 #define XIDirectTouch 1
42 @@ -206,7 +214,13 @@
43 #define XI_RawTouchEnd 24
44 #define XI_BarrierHit 25 /* XI 2.3 */
45 #define XI_BarrierLeave 26
46 -#define XI_LASTEVENT XI_BarrierLeave
47 +#define XI_GesturePinchBegin 27 /* XI 2.4 */
48 +#define XI_GesturePinchUpdate 28
49 +#define XI_GesturePinchEnd 29
50 +#define XI_GestureSwipeBegin 30
51 +#define XI_GestureSwipeUpdate 31
52 +#define XI_GestureSwipeEnd 32
53 +#define XI_LASTEVENT XI_GestureSwipeEnd
54 /* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
55 * as XI_LASTEVENT if the server is supposed to handle masks etc. for this
56 * type of event. */
57 diff -u -r inputproto-2.3.2/XI2proto.h inputproto-2.4/XI2proto.h
58 --- inputproto-2.3.2/XI2proto.h 2014-08-25 03:09:23.000000000 +0200
59 +++ inputproto-2.4/XI2proto.h 2021-10-28 11:30:52.664670000 +0200
60 @@ -44,7 +44,7 @@
61 * appended to the common structs section before the definition of the
62 * first request.
63 * members of structs vertically aligned on column 16 if datatypes permit.
64 - * otherwise alingned on next available 8n column.
65 + * otherwise aligned on next available 8n column.
66 */
68 /**
69 @@ -149,8 +149,9 @@
71 /**
72 * Denotes button capability on a device.
73 - * Struct is followed by num_buttons * Atom that names the buttons in the
74 - * device-native setup (i.e. ignoring button mappings).
75 + * Struct is followed by a button bit-mask (padded to four byte chunks) and
76 + * then num_buttons * Atom that names the buttons in the device-native setup
77 + * (i.e. ignoring button mappings).
78 */
79 typedef struct {
80 uint16_t type; /**< Always ButtonClass */
81 @@ -218,6 +219,17 @@
82 } xXITouchInfo;
84 /**
85 + * Denotes touchpad gesture capability on a device.
86 + */
87 +typedef struct {
88 + uint16_t type; /**< Always GestureClass */
89 + uint16_t length; /**< Length in 4 byte units */
90 + uint16_t sourceid; /**< source device for this class */
91 + uint8_t num_touches; /**< Maximum number of touches gesture supports (0==unlimited) */
92 + uint8_t pad0;
93 +} xXIGestureInfo;
94 +
95 +/**
96 * Used to select for events on a given window.
97 * Struct is followed by (mask_len * CARD8), with each bit set representing
98 * the event mask for the given type. A mask bit represents an event type if
99 @@ -1082,6 +1094,72 @@
100 typedef xXIBarrierEvent xXIBarrierPointerReleasedEvent;
101 typedef xXIBarrierEvent xXIBarrierLeaveEvent;
103 +/**
104 + * Event for touchpad gesture pinch input events
105 + */
106 +typedef struct
107 +{
108 + uint8_t type; /**< Always GenericEvent */
109 + uint8_t extension; /**< XI extension offset */
110 + uint16_t sequenceNumber;
111 + uint32_t length; /**< Length in 4 byte uints */
112 + uint16_t evtype;
113 + uint16_t deviceid;
114 + Time time;
115 + uint32_t detail; /**< The number of touches in the gesture */
116 + Window root;
117 + Window event;
118 + Window child;
119 +/* └──────── 32 byte boundary ────────┘ */
120 + FP1616 root_x; /**< Always screen coords, 16.16 fixed point */
121 + FP1616 root_y;
122 + FP1616 event_x; /**< Always screen coords, 16.16 fixed point */
123 + FP1616 event_y;
124 + FP1616 delta_x;
125 + FP1616 delta_y;
126 + FP1616 delta_unaccel_x;
127 + FP1616 delta_unaccel_y;
128 + FP1616 scale;
129 + FP1616 delta_angle;
130 + uint16_t sourceid; /**< The source device */
131 + uint16_t pad0;
132 + xXIModifierInfo mods;
133 + xXIGroupInfo group;
134 + uint32_t flags; /**< ::XIGesturePinchEventCancelled */
135 +} xXIGesturePinchEvent;
136 +
137 +/**
138 + * Event for touchpad gesture swipe input events
139 + */
140 +typedef struct
141 +{
142 + uint8_t type; /**< Always GenericEvent */
143 + uint8_t extension; /**< XI extension offset */
144 + uint16_t sequenceNumber;
145 + uint32_t length; /**< Length in 4 byte uints */
146 + uint16_t evtype;
147 + uint16_t deviceid;
148 + Time time;
149 + uint32_t detail; /**< The number of touches in the gesture */
150 + Window root;
151 + Window event;
152 + Window child;
153 +/* └──────── 32 byte boundary ────────┘ */
154 + FP1616 root_x; /**< Always screen coords, 16.16 fixed point */
155 + FP1616 root_y;
156 + FP1616 event_x; /**< Always screen coords, 16.16 fixed point */
157 + FP1616 event_y;
158 + FP1616 delta_x;
159 + FP1616 delta_y;
160 + FP1616 delta_unaccel_x;
161 + FP1616 delta_unaccel_y;
162 + uint16_t sourceid; /**< The source device */
163 + uint16_t pad0;
164 + xXIModifierInfo mods;
165 + xXIGroupInfo group;
166 + uint32_t flags; /**< ::XIGestureSwipeEventCancelled */
167 +} xXIGestureSwipeEvent;
168 +
169 #undef Window
170 #undef Time
171 #undef Atom
172 diff -u -r inputproto-2.3.2/XIproto.h inputproto-2.4/XIproto.h
173 --- inputproto-2.3.2/XIproto.h 2014-05-29 23:15:03.000000000 +0200
174 +++ inputproto-2.4/XIproto.h 2021-10-28 11:30:52.669685000 +0200
175 @@ -177,24 +177,24 @@
176 typedef struct {
177 CARD8 reqType; /* input extension major code */
178 CARD8 ReqType; /* always X_GetExtensionVersion */
179 - CARD16 length B16;
180 - CARD16 nbytes B16;
181 + CARD16 length;
182 + CARD16 nbytes;
183 CARD8 pad1, pad2;
184 } xGetExtensionVersionReq;
186 typedef struct {
187 CARD8 repType; /* X_Reply */
188 CARD8 RepType; /* always X_GetExtensionVersion */
189 - CARD16 sequenceNumber B16;
190 - CARD32 length B32;
191 - CARD16 major_version B16;
192 - CARD16 minor_version B16;
193 + CARD16 sequenceNumber;
194 + CARD32 length;
195 + CARD16 major_version;
196 + CARD16 minor_version;
197 BOOL present;
198 CARD8 pad1, pad2, pad3;
199 - CARD32 pad01 B32;
200 - CARD32 pad02 B32;
201 - CARD32 pad03 B32;
202 - CARD32 pad04 B32;
203 + CARD32 pad01;
204 + CARD32 pad02;
205 + CARD32 pad03;
206 + CARD32 pad04;
207 } xGetExtensionVersionReply;
209 /*********************************************************
210 @@ -206,21 +206,21 @@
211 typedef struct {
212 CARD8 reqType; /* input extension major code */
213 CARD8 ReqType; /* always X_ListInputDevices */
214 - CARD16 length B16;
215 + CARD16 length;
216 } xListInputDevicesReq;
218 typedef struct {
219 CARD8 repType; /* X_Reply */
220 CARD8 RepType; /* always X_ListInputDevices */
221 - CARD16 sequenceNumber B16;
222 - CARD32 length B32;
223 + CARD16 sequenceNumber;
224 + CARD32 length;
225 CARD8 ndevices;
226 CARD8 pad1, pad2, pad3;
227 - CARD32 pad01 B32;
228 - CARD32 pad02 B32;
229 - CARD32 pad03 B32;
230 - CARD32 pad04 B32;
231 - CARD32 pad05 B32;
232 + CARD32 pad01;
233 + CARD32 pad02;
234 + CARD32 pad03;
235 + CARD32 pad04;
236 + CARD32 pad05;
237 } xListInputDevicesReply;
239 typedef struct _xDeviceInfo *xDeviceInfoPtr;
240 @@ -237,7 +237,7 @@
241 } xAnyClassInfo;
243 typedef struct _xDeviceInfo {
244 - CARD32 type B32;
245 + CARD32 type;
246 CARD8 id;
247 CARD8 num_classes;
248 CARD8 use; /* IsXPointer | IsXKeyboard | IsXExtension... */
249 @@ -255,7 +255,7 @@
250 CARD8 length;
251 KeyCode min_keycode;
252 KeyCode max_keycode;
253 - CARD16 num_keys B16;
254 + CARD16 num_keys;
255 CARD8 pad1,pad2;
256 } xKeyInfo;
258 @@ -268,7 +268,7 @@
259 CARD8 class;
260 #endif
261 CARD8 length;
262 - CARD16 num_buttons B16;
263 + CARD16 num_buttons;
264 } xButtonInfo;
266 typedef struct _xValuatorInfo *xValuatorInfoPtr;
267 @@ -282,15 +282,15 @@
268 CARD8 length;
269 CARD8 num_axes;
270 CARD8 mode;
271 - CARD32 motion_buffer_size B32;
272 + CARD32 motion_buffer_size;
273 } xValuatorInfo;
275 typedef struct _xAxisInfo *xAxisInfoPtr;
277 typedef struct _xAxisInfo {
278 - CARD32 resolution B32;
279 - CARD32 min_value B32;
280 - CARD32 max_value B32;
281 + CARD32 resolution;
282 + CARD32 min_value;
283 + CARD32 max_value;
284 } xAxisInfo;
286 /*********************************************************
287 @@ -302,7 +302,7 @@
288 typedef struct {
289 CARD8 reqType; /* input extension major code */
290 CARD8 ReqType; /* always X_OpenDevice */
291 - CARD16 length B16;
292 + CARD16 length;
293 CARD8 deviceid;
294 BYTE pad1, pad2, pad3;
295 } xOpenDeviceReq;
296 @@ -310,15 +310,15 @@
297 typedef struct {
298 CARD8 repType; /* X_Reply */
299 CARD8 RepType; /* always X_OpenDevice */
300 - CARD16 sequenceNumber B16;
301 - CARD32 length B32;
302 + CARD16 sequenceNumber;
303 + CARD32 length;
304 CARD8 num_classes;
305 BYTE pad1, pad2, pad3;
306 - CARD32 pad00 B32;
307 - CARD32 pad01 B32;
308 - CARD32 pad02 B32;
309 - CARD32 pad03 B32;
310 - CARD32 pad04 B32;
311 + CARD32 pad00;
312 + CARD32 pad01;
313 + CARD32 pad02;
314 + CARD32 pad03;
315 + CARD32 pad04;
316 } xOpenDeviceReply;
318 typedef struct {
319 @@ -339,7 +339,7 @@
320 typedef struct {
321 CARD8 reqType; /* input extension major code */
322 CARD8 ReqType; /* always X_CloseDevice */
323 - CARD16 length B16;
324 + CARD16 length;
325 CARD8 deviceid;
326 BYTE pad1, pad2, pad3;
327 } xCloseDeviceReq;
328 @@ -353,7 +353,7 @@
329 typedef struct {
330 CARD8 reqType; /* input extension major code */
331 CARD8 ReqType; /* always X_SetDeviceMode */
332 - CARD16 length B16;
333 + CARD16 length;
334 CARD8 deviceid;
335 CARD8 mode;
336 BYTE pad1, pad2;
337 @@ -362,15 +362,15 @@
338 typedef struct {
339 CARD8 repType; /* X_Reply */
340 CARD8 RepType; /* always X_SetDeviceMode */
341 - CARD16 sequenceNumber B16;
342 - CARD32 length B32;
343 + CARD16 sequenceNumber;
344 + CARD32 length;
345 CARD8 status;
346 BYTE pad1, pad2, pad3;
347 - CARD32 pad01 B32;
348 - CARD32 pad02 B32;
349 - CARD32 pad03 B32;
350 - CARD32 pad04 B32;
351 - CARD32 pad05 B32;
352 + CARD32 pad01;
353 + CARD32 pad02;
354 + CARD32 pad03;
355 + CARD32 pad04;
356 + CARD32 pad05;
357 } xSetDeviceModeReply;
359 /*********************************************************
360 @@ -382,10 +382,10 @@
361 typedef struct {
362 CARD8 reqType; /* input extension major code */
363 CARD8 ReqType; /* always X_SelectExtensionEvent */
364 - CARD16 length B16;
365 - Window window B32;
366 - CARD16 count B16;
367 - CARD16 pad00 B16;
368 + CARD16 length;
369 + Window window;
370 + CARD16 count;
371 + CARD16 pad00;
372 } xSelectExtensionEventReq;
374 /*********************************************************
375 @@ -397,22 +397,22 @@
376 typedef struct {
377 CARD8 reqType; /* input extension major code */
378 CARD8 ReqType; /* X_GetSelectedExtensionEvents */
379 - CARD16 length B16;
380 - Window window B32;
381 + CARD16 length;
382 + Window window;
383 } xGetSelectedExtensionEventsReq;
385 typedef struct {
386 CARD8 repType; /* X_Reply */
387 CARD8 RepType; /* GetSelectedExtensionEvents */
388 - CARD16 sequenceNumber B16;
389 - CARD32 length B32;
390 - CARD16 this_client_count B16;
391 - CARD16 all_clients_count B16;
392 - CARD32 pad01 B32;
393 - CARD32 pad02 B32;
394 - CARD32 pad03 B32;
395 - CARD32 pad04 B32;
396 - CARD32 pad05 B32;
397 + CARD16 sequenceNumber;
398 + CARD32 length;
399 + CARD16 this_client_count;
400 + CARD16 all_clients_count;
401 + CARD32 pad01;
402 + CARD32 pad02;
403 + CARD32 pad03;
404 + CARD32 pad04;
405 + CARD32 pad05;
406 } xGetSelectedExtensionEventsReply;
408 /*********************************************************
409 @@ -424,9 +424,9 @@
410 typedef struct {
411 CARD8 reqType; /* input extension major code */
412 CARD8 ReqType; /* X_ChangeDeviceDontPropagateList */
413 - CARD16 length B16;
414 - Window window B32;
415 - CARD16 count B16;
416 + CARD16 length;
417 + Window window;
418 + CARD16 count;
419 CARD8 mode;
420 BYTE pad;
421 } xChangeDeviceDontPropagateListReq;
422 @@ -440,22 +440,22 @@
423 typedef struct {
424 CARD8 reqType; /* input extension major code */
425 CARD8 ReqType; /* X_GetDeviceDontPropagateList */
426 - CARD16 length B16;
427 - Window window B32;
428 + CARD16 length;
429 + Window window;
430 } xGetDeviceDontPropagateListReq;
432 typedef struct {
433 CARD8 repType; /* X_Reply */
434 CARD8 RepType; /* GetDeviceDontPropagateList */
435 - CARD16 sequenceNumber B16;
436 - CARD32 length B32;
437 - CARD16 count B16;
438 - CARD16 pad00 B16;
439 - CARD32 pad01 B32;
440 - CARD32 pad02 B32;
441 - CARD32 pad03 B32;
442 - CARD32 pad04 B32;
443 - CARD32 pad05 B32;
444 + CARD16 sequenceNumber;
445 + CARD32 length;
446 + CARD16 count;
447 + CARD16 pad00;
448 + CARD32 pad01;
449 + CARD32 pad02;
450 + CARD32 pad03;
451 + CARD32 pad04;
452 + CARD32 pad05;
453 } xGetDeviceDontPropagateListReply;
455 /*********************************************************
456 @@ -467,9 +467,9 @@
457 typedef struct {
458 CARD8 reqType; /* input extension major code */
459 CARD8 ReqType; /* always X_GetDeviceMotionEvents*/
460 - CARD16 length B16;
461 - Time start B32;
462 - Time stop B32;
463 + CARD16 length;
464 + Time start;
465 + Time stop;
466 CARD8 deviceid;
467 BYTE pad1, pad2, pad3;
468 } xGetDeviceMotionEventsReq;
469 @@ -477,16 +477,16 @@
470 typedef struct {
471 CARD8 repType; /* X_Reply */
472 CARD8 RepType; /* always X_GetDeviceMotionEvents */
473 - CARD16 sequenceNumber B16;
474 - CARD32 length B32;
475 - CARD32 nEvents B32;
476 + CARD16 sequenceNumber;
477 + CARD32 length;
478 + CARD32 nEvents;
479 CARD8 axes;
480 CARD8 mode;
481 BYTE pad1, pad2;
482 - CARD32 pad01 B32;
483 - CARD32 pad02 B32;
484 - CARD32 pad03 B32;
485 - CARD32 pad04 B32;
486 + CARD32 pad01;
487 + CARD32 pad02;
488 + CARD32 pad03;
489 + CARD32 pad04;
490 } xGetDeviceMotionEventsReply;
492 /*********************************************************
493 @@ -498,7 +498,7 @@
494 typedef struct {
495 CARD8 reqType; /* input extension major code */
496 CARD8 ReqType; /* X_ChangeKeyboardDevice */
497 - CARD16 length B16;
498 + CARD16 length;
499 CARD8 deviceid;
500 BYTE pad1, pad2, pad3;
501 } xChangeKeyboardDeviceReq;
502 @@ -506,15 +506,15 @@
503 typedef struct {
504 CARD8 repType; /* X_Reply */
505 CARD8 RepType; /* always X_ChangeKeyboardDevice*/
506 - CARD16 sequenceNumber B16;
507 - CARD32 length B32; /* 0 */
508 + CARD16 sequenceNumber;
509 + CARD32 length; /* 0 */
510 CARD8 status;
511 BYTE pad1, pad2, pad3;
512 - CARD32 pad01 B32;
513 - CARD32 pad02 B32;
514 - CARD32 pad03 B32;
515 - CARD32 pad04 B32;
516 - CARD32 pad05 B32;
517 + CARD32 pad01;
518 + CARD32 pad02;
519 + CARD32 pad03;
520 + CARD32 pad04;
521 + CARD32 pad05;
522 } xChangeKeyboardDeviceReply;
524 /*********************************************************
525 @@ -526,7 +526,7 @@
526 typedef struct {
527 CARD8 reqType; /* input extension major code */
528 CARD8 ReqType; /* X_ChangePointerDevice */
529 - CARD16 length B16;
530 + CARD16 length;
531 CARD8 xaxis;
532 CARD8 yaxis;
533 CARD8 deviceid;
534 @@ -536,15 +536,15 @@
535 typedef struct {
536 CARD8 repType; /* X_Reply */
537 CARD8 RepType; /* always X_ChangePointerDevice */
538 - CARD16 sequenceNumber B16;
539 - CARD32 length B32; /* 0 */
540 + CARD16 sequenceNumber;
541 + CARD32 length; /* 0 */
542 CARD8 status;
543 BYTE pad1, pad2, pad3;
544 - CARD32 pad01 B32;
545 - CARD32 pad02 B32;
546 - CARD32 pad03 B32;
547 - CARD32 pad04 B32;
548 - CARD32 pad05 B32;
549 + CARD32 pad01;
550 + CARD32 pad02;
551 + CARD32 pad03;
552 + CARD32 pad04;
553 + CARD32 pad05;
554 } xChangePointerDeviceReply;
556 /*********************************************************
557 @@ -556,29 +556,29 @@
558 typedef struct {
559 CARD8 reqType; /* input extension major code */
560 CARD8 ReqType; /* always X_GrabDevice */
561 - CARD16 length B16;
562 - Window grabWindow B32;
563 - Time time B32;
564 - CARD16 event_count B16;
565 + CARD16 length;
566 + Window grabWindow;
567 + Time time;
568 + CARD16 event_count;
569 CARD8 this_device_mode;
570 CARD8 other_devices_mode;
571 BOOL ownerEvents;
572 CARD8 deviceid;
573 - CARD16 pad01 B16;
574 + CARD16 pad01;
575 } xGrabDeviceReq;
577 typedef struct {
578 CARD8 repType; /* X_Reply */
579 CARD8 RepType; /* always X_GrabDevice */
580 - CARD16 sequenceNumber B16;
581 - CARD32 length B32; /* 0 */
582 + CARD16 sequenceNumber;
583 + CARD32 length; /* 0 */
584 CARD8 status;
585 BYTE pad1, pad2, pad3;
586 - CARD32 pad01 B32;
587 - CARD32 pad02 B32;
588 - CARD32 pad03 B32;
589 - CARD32 pad04 B32;
590 - CARD32 pad05 B32;
591 + CARD32 pad01;
592 + CARD32 pad02;
593 + CARD32 pad03;
594 + CARD32 pad04;
595 + CARD32 pad05;
596 } xGrabDeviceReply;
598 /*********************************************************
599 @@ -590,8 +590,8 @@
600 typedef struct {
601 CARD8 reqType; /* input extension major code */
602 CARD8 ReqType; /* always X_UnGrabDevice */
603 - CARD16 length B16;
604 - Time time B32;
605 + CARD16 length;
606 + Time time;
607 CARD8 deviceid;
608 BYTE pad1, pad2, pad3;
609 } xUngrabDeviceReq;
610 @@ -605,10 +605,10 @@
611 typedef struct {
612 CARD8 reqType; /* input extension major code */
613 CARD8 ReqType; /* always X_GrabDeviceKey */
614 - CARD16 length B16;
615 - Window grabWindow B32;
616 - CARD16 event_count B16;
617 - CARD16 modifiers B16;
618 + CARD16 length;
619 + Window grabWindow;
620 + CARD16 event_count;
621 + CARD16 modifiers;
622 CARD8 modifier_device;
623 CARD8 grabbed_device;
624 CARD8 key;
625 @@ -627,9 +627,9 @@
626 typedef struct {
627 CARD8 reqType; /* input extension major code */
628 CARD8 ReqType; /* always X_UngrabDeviceKey */
629 - CARD16 length B16;
630 - Window grabWindow B32;
631 - CARD16 modifiers B16;
632 + CARD16 length;
633 + Window grabWindow;
634 + CARD16 modifiers;
635 CARD8 modifier_device;
636 CARD8 key;
637 CARD8 grabbed_device;
638 @@ -645,12 +645,12 @@
639 typedef struct {
640 CARD8 reqType; /* input extension major code */
641 CARD8 ReqType; /* always X_GrabDeviceButton */
642 - CARD16 length B16;
643 - Window grabWindow B32;
644 + CARD16 length;
645 + Window grabWindow;
646 CARD8 grabbed_device;
647 CARD8 modifier_device;
648 - CARD16 event_count B16;
649 - CARD16 modifiers B16;
650 + CARD16 event_count;
651 + CARD16 modifiers;
652 BYTE this_device_mode;
653 BYTE other_devices_mode;
654 CARD8 button;
655 @@ -667,9 +667,9 @@
656 typedef struct {
657 CARD8 reqType; /* input extension major code */
658 CARD8 ReqType; /* always X_UngrabDeviceButton */
659 - CARD16 length B16;
660 - Window grabWindow B32;
661 - CARD16 modifiers B16;
662 + CARD16 length;
663 + Window grabWindow;
664 + CARD16 modifiers;
665 CARD8 modifier_device;
666 CARD8 button;
667 CARD8 grabbed_device;
668 @@ -685,8 +685,8 @@
669 typedef struct {
670 CARD8 reqType; /* input extension major code */
671 CARD8 ReqType; /* always X_AllowDeviceEvents */
672 - CARD16 length B16;
673 - Time time B32;
674 + CARD16 length;
675 + Time time;
676 CARD8 mode;
677 CARD8 deviceid;
678 BYTE pad1, pad2;
679 @@ -701,7 +701,7 @@
680 typedef struct {
681 CARD8 reqType; /* input extension major code */
682 CARD8 ReqType; /* always X_GetDeviceFocus */
683 - CARD16 length B16;
684 + CARD16 length;
685 CARD8 deviceid;
686 BYTE pad1, pad2, pad3;
687 } xGetDeviceFocusReq;
688 @@ -709,15 +709,15 @@
689 typedef struct {
690 CARD8 repType; /* X_Reply */
691 CARD8 RepType; /* always X_GetDeviceFocus */
692 - CARD16 sequenceNumber B16;
693 - CARD32 length B32;
694 - CARD32 focus B32;
695 - Time time B32;
696 + CARD16 sequenceNumber;
697 + CARD32 length;
698 + CARD32 focus;
699 + Time time;
700 CARD8 revertTo;
701 BYTE pad1, pad2, pad3;
702 - CARD32 pad01 B32;
703 - CARD32 pad02 B32;
704 - CARD32 pad03 B32;
705 + CARD32 pad01;
706 + CARD32 pad02;
707 + CARD32 pad03;
708 } xGetDeviceFocusReply;
710 /*********************************************************
711 @@ -729,12 +729,12 @@
712 typedef struct {
713 CARD8 reqType; /* input extension major code */
714 CARD8 ReqType; /* always X_SetDeviceFocus */
715 - CARD16 length B16;
716 - Window focus B32;
717 - Time time B32;
718 + CARD16 length;
719 + Window focus;
720 + Time time;
721 CARD8 revertTo;
722 CARD8 device;
723 - CARD16 pad01 B16;
724 + CARD16 pad01;
725 } xSetDeviceFocusReq;
727 /*********************************************************
728 @@ -746,7 +746,7 @@
729 typedef struct {
730 CARD8 reqType; /* input extension major code */
731 CARD8 ReqType; /* X_GetFeedbackControl */
732 - CARD16 length B16;
733 + CARD16 length;
734 CARD8 deviceid;
735 BYTE pad1, pad2, pad3;
736 } xGetFeedbackControlReq;
737 @@ -754,15 +754,15 @@
738 typedef struct {
739 CARD8 repType; /* X_Reply */
740 CARD8 RepType; /* always X_GetFeedbackControl */
741 - CARD16 sequenceNumber B16;
742 - CARD32 length B32;
743 - CARD16 num_feedbacks B16;
744 - CARD16 pad01 B16;
745 - CARD32 pad02 B32;
746 - CARD32 pad03 B32;
747 - CARD32 pad04 B32;
748 - CARD32 pad05 B32;
749 - CARD32 pad06 B32;
750 + CARD16 sequenceNumber;
751 + CARD32 length;
752 + CARD16 num_feedbacks;
753 + CARD16 pad01;
754 + CARD32 pad02;
755 + CARD32 pad03;
756 + CARD32 pad04;
757 + CARD32 pad05;
758 + CARD32 pad06;
759 } xGetFeedbackControlReply;
761 typedef struct {
762 @@ -772,7 +772,7 @@
763 CARD8 class; /* feedback class */
764 #endif
765 CARD8 id; /* feedback id */
766 - CARD16 length B16; /* feedback length */
767 + CARD16 length; /* feedback length */
768 } xFeedbackState;
770 typedef struct {
771 @@ -782,11 +782,11 @@
772 CARD8 class;
773 #endif
774 CARD8 id;
775 - CARD16 length B16;
776 - CARD16 pitch B16;
777 - CARD16 duration B16;
778 - CARD32 led_mask B32;
779 - CARD32 led_values B32;
780 + CARD16 length;
781 + CARD16 pitch;
782 + CARD16 duration;
783 + CARD32 led_mask;
784 + CARD32 led_values;
785 BOOL global_auto_repeat;
786 CARD8 click;
787 CARD8 percent;
788 @@ -801,11 +801,11 @@
789 CARD8 class;
790 #endif
791 CARD8 id;
792 - CARD16 length B16;
793 + CARD16 length;
794 CARD8 pad1,pad2;
795 - CARD16 accelNum B16;
796 - CARD16 accelDenom B16;
797 - CARD16 threshold B16;
798 + CARD16 accelNum;
799 + CARD16 accelDenom;
800 + CARD16 threshold;
801 } xPtrFeedbackState;
803 typedef struct {
804 @@ -815,10 +815,10 @@
805 CARD8 class; /* feedback class id */
806 #endif
807 CARD8 id;
808 - CARD16 length B16; /* feedback length */
809 - CARD32 resolution B32;
810 - INT32 min_value B32;
811 - INT32 max_value B32;
812 + CARD16 length; /* feedback length */
813 + CARD32 resolution;
814 + INT32 min_value;
815 + INT32 max_value;
816 } xIntegerFeedbackState;
818 typedef struct {
819 @@ -828,9 +828,9 @@
820 CARD8 class; /* feedback class id */
821 #endif
822 CARD8 id;
823 - CARD16 length B16; /* feedback length */
824 - CARD16 max_symbols B16;
825 - CARD16 num_syms_supported B16;
826 + CARD16 length; /* feedback length */
827 + CARD16 max_symbols;
828 + CARD16 num_syms_supported;
829 } xStringFeedbackState;
831 typedef struct {
832 @@ -840,11 +840,11 @@
833 CARD8 class; /* feedback class id */
834 #endif
835 CARD8 id;
836 - CARD16 length B16; /* feedback length */
837 + CARD16 length; /* feedback length */
838 CARD8 percent;
839 BYTE pad1, pad2, pad3;
840 - CARD16 pitch B16;
841 - CARD16 duration B16;
842 + CARD16 pitch;
843 + CARD16 duration;
844 } xBellFeedbackState;
846 typedef struct {
847 @@ -854,9 +854,9 @@
848 CARD8 class; /* feedback class id */
849 #endif
850 CARD8 id;
851 - CARD16 length B16; /* feedback length */
852 - CARD32 led_mask B32;
853 - CARD32 led_values B32;
854 + CARD16 length; /* feedback length */
855 + CARD32 led_mask;
856 + CARD32 led_values;
857 } xLedFeedbackState;
859 /*********************************************************
860 @@ -868,8 +868,8 @@
861 typedef struct {
862 CARD8 reqType; /* input extension major code */
863 CARD8 ReqType; /* X_ChangeFeedbackControl */
864 - CARD16 length B16;
865 - CARD32 mask B32;
866 + CARD16 length;
867 + CARD32 mask;
868 CARD8 deviceid;
869 CARD8 feedbackid;
870 BYTE pad1, pad2;
871 @@ -882,7 +882,7 @@
872 CARD8 class; /* feedback class id */
873 #endif
874 CARD8 id; /* feedback id */
875 - CARD16 length B16; /* feedback length */
876 + CARD16 length; /* feedback length */
877 } xFeedbackCtl;
879 typedef struct {
880 @@ -892,15 +892,15 @@
881 CARD8 class; /* feedback class id */
882 #endif
883 CARD8 id; /* feedback length */
884 - CARD16 length B16; /* feedback length */
885 + CARD16 length; /* feedback length */
886 KeyCode key;
887 CARD8 auto_repeat_mode;
888 INT8 click;
889 INT8 percent;
890 - INT16 pitch B16;
891 - INT16 duration B16;
892 - CARD32 led_mask B32;
893 - CARD32 led_values B32;
894 + INT16 pitch;
895 + INT16 duration;
896 + CARD32 led_mask;
897 + CARD32 led_values;
898 } xKbdFeedbackCtl;
900 typedef struct {
901 @@ -910,11 +910,11 @@
902 CARD8 class; /* feedback class id */
903 #endif
904 CARD8 id; /* feedback id */
905 - CARD16 length B16; /* feedback length */
906 + CARD16 length; /* feedback length */
907 CARD8 pad1,pad2;
908 - INT16 num B16;
909 - INT16 denom B16;
910 - INT16 thresh B16;
911 + INT16 num;
912 + INT16 denom;
913 + INT16 thresh;
914 } xPtrFeedbackCtl;
916 typedef struct {
917 @@ -924,8 +924,8 @@
918 CARD8 class; /* feedback class id */
919 #endif
920 CARD8 id; /* feedback id */
921 - CARD16 length B16; /* feedback length */
922 - INT32 int_to_display B32;
923 + CARD16 length; /* feedback length */
924 + INT32 int_to_display;
925 } xIntegerFeedbackCtl;
927 typedef struct {
928 @@ -935,9 +935,9 @@
929 CARD8 class; /* feedback class id */
930 #endif
931 CARD8 id; /* feedback id */
932 - CARD16 length B16; /* feedback length */
933 + CARD16 length; /* feedback length */
934 CARD8 pad1,pad2;
935 - CARD16 num_keysyms B16;
936 + CARD16 num_keysyms;
937 } xStringFeedbackCtl;
939 typedef struct {
940 @@ -947,11 +947,11 @@
941 CARD8 class; /* feedback class id */
942 #endif
943 CARD8 id; /* feedback id */
944 - CARD16 length B16; /* feedback length */
945 + CARD16 length; /* feedback length */
946 INT8 percent;
947 BYTE pad1, pad2, pad3;
948 - INT16 pitch B16;
949 - INT16 duration B16;
950 + INT16 pitch;
951 + INT16 duration;
952 } xBellFeedbackCtl;
954 typedef struct {
955 @@ -961,9 +961,9 @@
956 CARD8 class; /* feedback class id */
957 #endif
958 CARD8 id; /* feedback id */
959 - CARD16 length B16; /* feedback length */
960 - CARD32 led_mask B32;
961 - CARD32 led_values B32;
962 + CARD16 length; /* feedback length */
963 + CARD32 led_mask;
964 + CARD32 led_values;
965 } xLedFeedbackCtl;
967 /*********************************************************
968 @@ -975,7 +975,7 @@
969 typedef struct {
970 CARD8 reqType; /* input extension major code */
971 CARD8 ReqType; /* always X_GetDeviceKeyMapping */
972 - CARD16 length B16;
973 + CARD16 length;
974 CARD8 deviceid;
975 KeyCode firstKeyCode;
976 CARD8 count;
977 @@ -985,16 +985,16 @@
978 typedef struct {
979 CARD8 repType; /* X_Reply */
980 CARD8 RepType; /* always X_GetDeviceKeyMapping */
981 - CARD16 sequenceNumber B16;
982 - CARD32 length B32;
983 + CARD16 sequenceNumber;
984 + CARD32 length;
985 CARD8 keySymsPerKeyCode;
986 CARD8 pad0;
987 - CARD16 pad1 B16;
988 - CARD32 pad2 B32;
989 - CARD32 pad3 B32;
990 - CARD32 pad4 B32;
991 - CARD32 pad5 B32;
992 - CARD32 pad6 B32;
993 + CARD16 pad1;
994 + CARD32 pad2;
995 + CARD32 pad3;
996 + CARD32 pad4;
997 + CARD32 pad5;
998 + CARD32 pad6;
999 } xGetDeviceKeyMappingReply;
1001 /*********************************************************
1002 @@ -1006,7 +1006,7 @@
1003 typedef struct {
1004 CARD8 reqType; /* input extension major code */
1005 CARD8 ReqType; /* always X_ChangeDeviceKeyMapping */
1006 - CARD16 length B16;
1007 + CARD16 length;
1008 CARD8 deviceid;
1009 KeyCode firstKeyCode;
1010 CARD8 keySymsPerKeyCode;
1011 @@ -1022,7 +1022,7 @@
1012 typedef struct {
1013 CARD8 reqType; /* input extension major code */
1014 CARD8 ReqType; /* always X_GetDeviceModifierMapping */
1015 - CARD16 length B16;
1016 + CARD16 length;
1017 CARD8 deviceid;
1018 BYTE pad1, pad2, pad3;
1019 } xGetDeviceModifierMappingReq;
1020 @@ -1030,16 +1030,16 @@
1021 typedef struct {
1022 CARD8 repType; /* X_Reply */
1023 CARD8 RepType; /* always X_GetDeviceModifierMapping */
1024 - CARD16 sequenceNumber B16;
1025 - CARD32 length B32;
1026 + CARD16 sequenceNumber;
1027 + CARD32 length;
1028 CARD8 numKeyPerModifier;
1029 CARD8 pad0;
1030 - CARD16 pad1 B16;
1031 - CARD32 pad2 B32;
1032 - CARD32 pad3 B32;
1033 - CARD32 pad4 B32;
1034 - CARD32 pad5 B32;
1035 - CARD32 pad6 B32;
1036 + CARD16 pad1;
1037 + CARD32 pad2;
1038 + CARD32 pad3;
1039 + CARD32 pad4;
1040 + CARD32 pad5;
1041 + CARD32 pad6;
1042 } xGetDeviceModifierMappingReply;
1044 /*********************************************************
1045 @@ -1051,25 +1051,25 @@
1046 typedef struct {
1047 CARD8 reqType; /* input extension major code */
1048 CARD8 ReqType; /* always X_SetDeviceModifierMapping */
1049 - CARD16 length B16;
1050 + CARD16 length;
1051 CARD8 deviceid;
1052 CARD8 numKeyPerModifier;
1053 - CARD16 pad1 B16;
1054 + CARD16 pad1;
1055 } xSetDeviceModifierMappingReq;
1057 typedef struct {
1058 CARD8 repType; /* X_Reply */
1059 CARD8 RepType; /* always X_SetDeviceModifierMapping */
1060 - CARD16 sequenceNumber B16;
1061 - CARD32 length B32;
1062 + CARD16 sequenceNumber;
1063 + CARD32 length;
1064 CARD8 success;
1065 CARD8 pad0;
1066 - CARD16 pad1 B16;
1067 - CARD32 pad2 B32;
1068 - CARD32 pad3 B32;
1069 - CARD32 pad4 B32;
1070 - CARD32 pad5 B32;
1071 - CARD32 pad6 B32;
1072 + CARD16 pad1;
1073 + CARD32 pad2;
1074 + CARD32 pad3;
1075 + CARD32 pad4;
1076 + CARD32 pad5;
1077 + CARD32 pad6;
1078 } xSetDeviceModifierMappingReply;
1080 /*********************************************************
1081 @@ -1081,7 +1081,7 @@
1082 typedef struct {
1083 CARD8 reqType; /* input extension major code */
1084 CARD8 ReqType; /* X_GetDeviceButtonMapping */
1085 - CARD16 length B16;
1086 + CARD16 length;
1087 CARD8 deviceid;
1088 BYTE pad1, pad2, pad3;
1089 } xGetDeviceButtonMappingReq;
1090 @@ -1089,15 +1089,15 @@
1091 typedef struct {
1092 CARD8 repType; /* X_Reply */
1093 CARD8 RepType; /* always X_GetDeviceButtonMapping */
1094 - CARD16 sequenceNumber B16;
1095 - CARD32 length B32;
1096 + CARD16 sequenceNumber;
1097 + CARD32 length;
1098 CARD8 nElts;
1099 BYTE pad1, pad2, pad3;
1100 - CARD32 pad01 B32;
1101 - CARD32 pad02 B32;
1102 - CARD32 pad03 B32;
1103 - CARD32 pad04 B32;
1104 - CARD32 pad05 B32;
1105 + CARD32 pad01;
1106 + CARD32 pad02;
1107 + CARD32 pad03;
1108 + CARD32 pad04;
1109 + CARD32 pad05;
1110 } xGetDeviceButtonMappingReply;
1112 /*********************************************************
1113 @@ -1109,7 +1109,7 @@
1114 typedef struct {
1115 CARD8 reqType; /* input extension major code */
1116 CARD8 ReqType; /* X_SetDeviceButtonMapping */
1117 - CARD16 length B16;
1118 + CARD16 length;
1119 CARD8 deviceid;
1120 CARD8 map_length;
1121 BYTE pad1, pad2;
1122 @@ -1118,16 +1118,16 @@
1123 typedef struct {
1124 CARD8 repType; /* X_Reply */
1125 CARD8 RepType; /* always X_SetDeviceButtonMapping */
1126 - CARD16 sequenceNumber B16;
1127 - CARD32 length B32;
1128 + CARD16 sequenceNumber;
1129 + CARD32 length;
1130 CARD8 status;
1131 BYTE pad0;
1132 - CARD16 pad1 B16;
1133 - CARD32 pad2 B32;
1134 - CARD32 pad3 B32;
1135 - CARD32 pad4 B32;
1136 - CARD32 pad5 B32;
1137 - CARD32 pad6 B32;
1138 + CARD16 pad1;
1139 + CARD32 pad2;
1140 + CARD32 pad3;
1141 + CARD32 pad4;
1142 + CARD32 pad5;
1143 + CARD32 pad6;
1144 } xSetDeviceButtonMappingReply;
1146 /*********************************************************
1147 @@ -1139,7 +1139,7 @@
1148 typedef struct {
1149 CARD8 reqType;
1150 CARD8 ReqType; /* always X_QueryDeviceState */
1151 - CARD16 length B16;
1152 + CARD16 length;
1153 CARD8 deviceid;
1154 BYTE pad1, pad2, pad3;
1155 } xQueryDeviceStateReq;
1156 @@ -1147,16 +1147,16 @@
1157 typedef struct {
1158 CARD8 repType; /* X_Reply */
1159 CARD8 RepType; /* always X_QueryDeviceState */
1160 - CARD16 sequenceNumber B16;
1161 - CARD32 length B32;
1162 + CARD16 sequenceNumber;
1163 + CARD32 length;
1164 CARD8 num_classes;
1165 BYTE pad0;
1166 - CARD16 pad1 B16;
1167 - CARD32 pad2 B32;
1168 - CARD32 pad3 B32;
1169 - CARD32 pad4 B32;
1170 - CARD32 pad5 B32;
1171 - CARD32 pad6 B32;
1172 + CARD16 pad1;
1173 + CARD32 pad2;
1174 + CARD32 pad3;
1175 + CARD32 pad4;
1176 + CARD32 pad5;
1177 + CARD32 pad6;
1178 } xQueryDeviceStateReply;
1180 typedef struct {
1181 @@ -1205,11 +1205,11 @@
1182 typedef struct {
1183 CARD8 reqType;
1184 CARD8 ReqType; /* always X_SendExtensionEvent */
1185 - CARD16 length B16;
1186 - Window destination B32;
1187 + CARD16 length;
1188 + Window destination;
1189 CARD8 deviceid;
1190 BOOL propagate;
1191 - CARD16 count B16;
1192 + CARD16 count;
1193 CARD8 num_events;
1194 BYTE pad1,pad2,pad3;
1195 } xSendExtensionEventReq;
1196 @@ -1223,7 +1223,7 @@
1197 typedef struct {
1198 CARD8 reqType;
1199 CARD8 ReqType; /* always X_DeviceBell */
1200 - CARD16 length B16;
1201 + CARD16 length;
1202 CARD8 deviceid;
1203 CARD8 feedbackid;
1204 CARD8 feedbackclass;
1205 @@ -1239,7 +1239,7 @@
1206 typedef struct {
1207 CARD8 reqType; /* input extension major code */
1208 CARD8 ReqType; /* always X_SetDeviceValuators */
1209 - CARD16 length B16;
1210 + CARD16 length;
1211 CARD8 deviceid;
1212 CARD8 first_valuator;
1213 CARD8 num_valuators;
1214 @@ -1249,15 +1249,15 @@
1215 typedef struct {
1216 CARD8 repType; /* X_Reply */
1217 CARD8 RepType; /* always X_SetDeviceValuators */
1218 - CARD16 sequenceNumber B16;
1219 - CARD32 length B32;
1220 + CARD16 sequenceNumber;
1221 + CARD32 length;
1222 CARD8 status;
1223 BYTE pad1, pad2, pad3;
1224 - CARD32 pad01 B32;
1225 - CARD32 pad02 B32;
1226 - CARD32 pad03 B32;
1227 - CARD32 pad04 B32;
1228 - CARD32 pad05 B32;
1229 + CARD32 pad01;
1230 + CARD32 pad02;
1231 + CARD32 pad03;
1232 + CARD32 pad04;
1233 + CARD32 pad05;
1234 } xSetDeviceValuatorsReply;
1236 /*********************************************************
1237 @@ -1269,8 +1269,8 @@
1238 typedef struct {
1239 CARD8 reqType; /* input extension major code */
1240 CARD8 ReqType; /* always X_GetDeviceControl */
1241 - CARD16 length B16;
1242 - CARD16 control B16;
1243 + CARD16 length;
1244 + CARD16 control;
1245 CARD8 deviceid;
1246 BYTE pad2;
1247 } xGetDeviceControlReq;
1248 @@ -1278,66 +1278,66 @@
1249 typedef struct {
1250 CARD8 repType; /* X_Reply */
1251 CARD8 RepType; /* always X_GetDeviceControl */
1252 - CARD16 sequenceNumber B16;
1253 - CARD32 length B32;
1254 + CARD16 sequenceNumber;
1255 + CARD32 length;
1256 CARD8 status;
1257 BYTE pad1, pad2, pad3;
1258 - CARD32 pad01 B32;
1259 - CARD32 pad02 B32;
1260 - CARD32 pad03 B32;
1261 - CARD32 pad04 B32;
1262 - CARD32 pad05 B32;
1263 + CARD32 pad01;
1264 + CARD32 pad02;
1265 + CARD32 pad03;
1266 + CARD32 pad04;
1267 + CARD32 pad05;
1268 } xGetDeviceControlReply;
1270 typedef struct {
1271 - CARD16 control B16; /* control type */
1272 - CARD16 length B16; /* control length */
1273 + CARD16 control; /* control type */
1274 + CARD16 length; /* control length */
1275 } xDeviceState;
1277 typedef struct {
1278 - CARD16 control B16; /* control type */
1279 - CARD16 length B16; /* control length */
1280 - CARD32 num_valuators B32; /* number of valuators */
1281 + CARD16 control; /* control type */
1282 + CARD16 length; /* control length */
1283 + CARD32 num_valuators; /* number of valuators */
1284 } xDeviceResolutionState;
1286 typedef struct {
1287 - CARD16 control B16;
1288 - CARD16 length B16;
1289 - INT32 min_x B32;
1290 - INT32 max_x B32;
1291 - INT32 min_y B32;
1292 - INT32 max_y B32;
1293 - CARD32 flip_x B32;
1294 - CARD32 flip_y B32;
1295 - CARD32 rotation B32;
1296 - CARD32 button_threshold B32;
1297 + CARD16 control;
1298 + CARD16 length;
1299 + INT32 min_x;
1300 + INT32 max_x;
1301 + INT32 min_y;
1302 + INT32 max_y;
1303 + CARD32 flip_x;
1304 + CARD32 flip_y;
1305 + CARD32 rotation;
1306 + CARD32 button_threshold;
1307 } xDeviceAbsCalibState;
1309 typedef struct {
1310 - CARD16 control B16;
1311 - CARD16 length B16;
1312 - CARD32 offset_x B32;
1313 - CARD32 offset_y B32;
1314 - CARD32 width B32;
1315 - CARD32 height B32;
1316 - CARD32 screen B32;
1317 - CARD32 following B32;
1318 + CARD16 control;
1319 + CARD16 length;
1320 + CARD32 offset_x;
1321 + CARD32 offset_y;
1322 + CARD32 width;
1323 + CARD32 height;
1324 + CARD32 screen;
1325 + CARD32 following;
1326 } xDeviceAbsAreaState;
1328 typedef struct {
1329 - CARD16 control B16; /* control type */
1330 - CARD16 length B16; /* control length */
1331 + CARD16 control; /* control type */
1332 + CARD16 length; /* control length */
1333 CARD8 status;
1334 CARD8 iscore;
1335 - CARD16 pad1 B16;
1336 + CARD16 pad1;
1337 } xDeviceCoreState;
1339 typedef struct {
1340 - CARD16 control B16; /* control type */
1341 - CARD16 length B16; /* control length */
1342 + CARD16 control; /* control type */
1343 + CARD16 length; /* control length */
1344 CARD8 enable;
1345 CARD8 pad0;
1346 - CARD16 pad1 B16;
1347 + CARD16 pad1;
1348 } xDeviceEnableState;
1350 /*********************************************************
1351 @@ -1349,8 +1349,8 @@
1352 typedef struct {
1353 CARD8 reqType; /* input extension major code */
1354 CARD8 ReqType; /* always X_ChangeDeviceControl */
1355 - CARD16 length B16;
1356 - CARD16 control B16;
1357 + CARD16 length;
1358 + CARD16 control;
1359 CARD8 deviceid;
1360 BYTE pad0;
1361 } xChangeDeviceControlReq;
1362 @@ -1358,33 +1358,33 @@
1363 typedef struct {
1364 CARD8 repType; /* X_Reply */
1365 CARD8 RepType; /* always X_ChangeDeviceControl */
1366 - CARD16 sequenceNumber B16;
1367 - CARD32 length B32;
1368 + CARD16 sequenceNumber;
1369 + CARD32 length;
1370 CARD8 status;
1371 BYTE pad1, pad2, pad3;
1372 - CARD32 pad01 B32;
1373 - CARD32 pad02 B32;
1374 - CARD32 pad03 B32;
1375 - CARD32 pad04 B32;
1376 - CARD32 pad05 B32;
1377 + CARD32 pad01;
1378 + CARD32 pad02;
1379 + CARD32 pad03;
1380 + CARD32 pad04;
1381 + CARD32 pad05;
1382 } xChangeDeviceControlReply;
1384 typedef struct {
1385 - CARD16 control B16; /* control type */
1386 - CARD16 length B16; /* control length */
1387 + CARD16 control; /* control type */
1388 + CARD16 length; /* control length */
1389 } xDeviceCtl;
1391 typedef struct {
1392 - CARD16 control B16; /* control type */
1393 - CARD16 length B16; /* control length */
1394 + CARD16 control; /* control type */
1395 + CARD16 length; /* control length */
1396 CARD8 first_valuator; /* first valuator to change */
1397 CARD8 num_valuators; /* number of valuators to change*/
1398 CARD8 pad1,pad2;
1399 } xDeviceResolutionCtl;
1401 typedef struct {
1402 - CARD16 control B16;
1403 - CARD16 length B16;
1404 + CARD16 control;
1405 + CARD16 length;
1406 INT32 min_x;
1407 INT32 max_x;
1408 INT32 min_y;
1409 @@ -1396,8 +1396,8 @@
1410 } xDeviceAbsCalibCtl;
1412 typedef struct {
1413 - CARD16 control B16;
1414 - CARD16 length B16;
1415 + CARD16 control;
1416 + CARD16 length;
1417 CARD32 offset_x;
1418 CARD32 offset_y;
1419 INT32 width;
1420 @@ -1407,19 +1407,19 @@
1421 } xDeviceAbsAreaCtl;
1423 typedef struct {
1424 - CARD16 control B16;
1425 - CARD16 length B16;
1426 + CARD16 control;
1427 + CARD16 length;
1428 CARD8 status;
1429 CARD8 pad0;
1430 - CARD16 pad1 B16;
1431 + CARD16 pad1;
1432 } xDeviceCoreCtl;
1434 typedef struct {
1435 - CARD16 control B16;
1436 - CARD16 length B16;
1437 + CARD16 control;
1438 + CARD16 length;
1439 CARD8 enable;
1440 CARD8 pad0;
1441 - CARD16 pad1 B16;
1442 + CARD16 pad1;
1443 } xDeviceEnableCtl;
1445 /* XI 1.5 */
1446 @@ -1433,24 +1433,24 @@
1447 typedef struct {
1448 CARD8 reqType; /* input extension major opcode */
1449 CARD8 ReqType; /* always X_ListDeviceProperties */
1450 - CARD16 length B16;
1451 + CARD16 length;
1452 CARD8 deviceid;
1453 CARD8 pad0;
1454 - CARD16 pad1 B16;
1455 + CARD16 pad1;
1456 } xListDevicePropertiesReq;
1458 typedef struct {
1459 CARD8 repType; /* X_Reply */
1460 CARD8 RepType; /* always X_ListDeviceProperties */
1461 - CARD16 sequenceNumber B16;
1462 - CARD32 length B32;
1463 - CARD16 nAtoms B16;
1464 - CARD16 pad1 B16;
1465 - CARD32 pad2 B32;
1466 - CARD32 pad3 B32;
1467 - CARD32 pad4 B32;
1468 - CARD32 pad5 B32;
1469 - CARD32 pad6 B32;
1470 + CARD16 sequenceNumber;
1471 + CARD32 length;
1472 + CARD16 nAtoms;
1473 + CARD16 pad1;
1474 + CARD32 pad2;
1475 + CARD32 pad3;
1476 + CARD32 pad4;
1477 + CARD32 pad5;
1478 + CARD32 pad6;
1479 } xListDevicePropertiesReply;
1481 /*********************************************************
1482 @@ -1462,14 +1462,14 @@
1483 typedef struct {
1484 CARD8 reqType; /* input extension major opcode */
1485 CARD8 ReqType; /* always X_ChangeDeviceProperty */
1486 - CARD16 length B16;
1487 - Atom property B32;
1488 - Atom type B32;
1489 + CARD16 length;
1490 + Atom property;
1491 + Atom type;
1492 CARD8 deviceid;
1493 CARD8 format;
1494 CARD8 mode;
1495 CARD8 pad;
1496 - CARD32 nUnits B32;
1497 + CARD32 nUnits;
1498 } xChangeDevicePropertyReq;
1500 /*********************************************************
1501 @@ -1481,11 +1481,11 @@
1502 typedef struct {
1503 CARD8 reqType; /* input extension major opcode */
1504 CARD8 ReqType; /* always X_DeleteDeviceProperty */
1505 - CARD16 length B16;
1506 - Atom property B32;
1507 + CARD16 length;
1508 + Atom property;
1509 CARD8 deviceid;
1510 CARD8 pad0;
1511 - CARD16 pad1 B16;
1512 + CARD16 pad1;
1513 } xDeleteDevicePropertyReq;
1515 /*********************************************************
1516 @@ -1497,11 +1497,11 @@
1517 typedef struct {
1518 CARD8 reqType; /* input extension major opcode */
1519 CARD8 ReqType; /* always X_GetDeviceProperty */
1520 - CARD16 length B16;
1521 - Atom property B32;
1522 - Atom type B32;
1523 - CARD32 longOffset B32;
1524 - CARD32 longLength B32;
1525 + CARD16 length;
1526 + Atom property;
1527 + Atom type;
1528 + CARD32 longOffset;
1529 + CARD32 longLength;
1530 CARD8 deviceid;
1531 #if defined(__cplusplus) || defined(c_plusplus)
1532 BOOL c_delete;
1533 @@ -1514,16 +1514,16 @@
1534 typedef struct {
1535 CARD8 repType; /* X_Reply */
1536 CARD8 RepType; /* always X_GetDeviceProperty */
1537 - CARD16 sequenceNumber B16;
1538 - CARD32 length B32;
1539 - Atom propertyType B32;
1540 - CARD32 bytesAfter B32;
1541 - CARD32 nItems B32;
1542 + CARD16 sequenceNumber;
1543 + CARD32 length;
1544 + Atom propertyType;
1545 + CARD32 bytesAfter;
1546 + CARD32 nItems;
1547 CARD8 format;
1548 CARD8 deviceid;
1549 - CARD16 pad1 B16;
1550 - CARD32 pad2 B32;
1551 - CARD32 pad3 B32;
1552 + CARD16 pad1;
1553 + CARD32 pad2;
1554 + CARD32 pad3;
1555 } xGetDevicePropertyReply;
1558 @@ -1539,16 +1539,16 @@
1559 {
1560 BYTE type;
1561 CARD8 deviceid;
1562 - CARD16 sequenceNumber B16;
1563 - KeyButMask device_state B16;
1564 + CARD16 sequenceNumber;
1565 + KeyButMask device_state;
1566 CARD8 num_valuators;
1567 CARD8 first_valuator;
1568 - INT32 valuator0 B32;
1569 - INT32 valuator1 B32;
1570 - INT32 valuator2 B32;
1571 - INT32 valuator3 B32;
1572 - INT32 valuator4 B32;
1573 - INT32 valuator5 B32;
1574 + INT32 valuator0;
1575 + INT32 valuator1;
1576 + INT32 valuator2;
1577 + INT32 valuator3;
1578 + INT32 valuator4;
1579 + INT32 valuator5;
1580 } deviceValuator;
1582 /**********************************************************
1583 @@ -1566,16 +1566,16 @@
1584 {
1585 BYTE type;
1586 BYTE detail;
1587 - CARD16 sequenceNumber B16;
1588 - Time time B32;
1589 - Window root B32;
1590 - Window event B32;
1591 - Window child B32;
1592 - INT16 root_x B16;
1593 - INT16 root_y B16;
1594 - INT16 event_x B16;
1595 - INT16 event_y B16;
1596 - KeyButMask state B16;
1597 + CARD16 sequenceNumber;
1598 + Time time;
1599 + Window root;
1600 + Window event;
1601 + Window child;
1602 + INT16 root_x;
1603 + INT16 root_y;
1604 + INT16 event_x;
1605 + INT16 event_y;
1606 + KeyButMask state;
1607 BOOL same_screen;
1608 CARD8 deviceid;
1609 } deviceKeyButtonPointer;
1610 @@ -1590,16 +1590,16 @@
1611 {
1612 BYTE type;
1613 BYTE detail;
1614 - CARD16 sequenceNumber B16;
1615 - Time time B32;
1616 - Window window B32;
1617 + CARD16 sequenceNumber;
1618 + Time time;
1619 + Window window;
1620 BYTE mode;
1621 CARD8 deviceid;
1622 BYTE pad1, pad2;
1623 - CARD32 pad00 B32;
1624 - CARD32 pad01 B32;
1625 - CARD32 pad02 B32;
1626 - CARD32 pad03 B32;
1627 + CARD32 pad00;
1628 + CARD32 pad01;
1629 + CARD32 pad02;
1630 + CARD32 pad03;
1631 } deviceFocus;
1633 /**********************************************************
1634 @@ -1616,17 +1616,17 @@
1635 {
1636 BYTE type;
1637 BYTE deviceid;
1638 - CARD16 sequenceNumber B16;
1639 - Time time B32;
1640 + CARD16 sequenceNumber;
1641 + Time time;
1642 CARD8 num_keys;
1643 CARD8 num_buttons;
1644 CARD8 num_valuators;
1645 CARD8 classes_reported;
1646 CARD8 buttons[4];
1647 CARD8 keys[4];
1648 - INT32 valuator0 B32;
1649 - INT32 valuator1 B32;
1650 - INT32 valuator2 B32;
1651 + INT32 valuator0;
1652 + INT32 valuator1;
1653 + INT32 valuator2;
1654 } deviceStateNotify;
1656 /**********************************************************
1657 @@ -1639,7 +1639,7 @@
1658 {
1659 BYTE type;
1660 BYTE deviceid;
1661 - CARD16 sequenceNumber B16;
1662 + CARD16 sequenceNumber;
1663 CARD8 keys[28];
1664 } deviceKeyStateNotify;
1666 @@ -1653,7 +1653,7 @@
1667 {
1668 BYTE type;
1669 BYTE deviceid;
1670 - CARD16 sequenceNumber B16;
1671 + CARD16 sequenceNumber;
1672 CARD8 buttons[28];
1673 } deviceButtonStateNotify;
1675 @@ -1668,17 +1668,17 @@
1676 {
1677 BYTE type;
1678 BYTE deviceid;
1679 - CARD16 sequenceNumber B16;
1680 + CARD16 sequenceNumber;
1681 CARD8 request;
1682 KeyCode firstKeyCode;
1683 CARD8 count;
1684 BYTE pad1;
1685 - Time time B32;
1686 - CARD32 pad00 B32;
1687 - CARD32 pad01 B32;
1688 - CARD32 pad02 B32;
1689 - CARD32 pad03 B32;
1690 - CARD32 pad04 B32;
1691 + Time time;
1692 + CARD32 pad00;
1693 + CARD32 pad01;
1694 + CARD32 pad02;
1695 + CARD32 pad03;
1696 + CARD32 pad04;
1697 } deviceMappingNotify;
1699 /**********************************************************
1700 @@ -1691,15 +1691,15 @@
1701 {
1702 BYTE type;
1703 BYTE deviceid;
1704 - CARD16 sequenceNumber B16;
1705 - Time time B32;
1706 + CARD16 sequenceNumber;
1707 + Time time;
1708 CARD8 request;
1709 BYTE pad1, pad2, pad3;
1710 - CARD32 pad00 B32;
1711 - CARD32 pad01 B32;
1712 - CARD32 pad02 B32;
1713 - CARD32 pad03 B32;
1714 - CARD32 pad04 B32;
1715 + CARD32 pad00;
1716 + CARD32 pad01;
1717 + CARD32 pad02;
1718 + CARD32 pad03;
1719 + CARD32 pad04;
1720 } changeDeviceNotify;
1722 /**********************************************************
1723 @@ -1712,16 +1712,16 @@
1724 {
1725 BYTE type;
1726 BYTE pad00;
1727 - CARD16 sequenceNumber B16;
1728 - Time time B32;
1729 + CARD16 sequenceNumber;
1730 + Time time;
1731 BYTE devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
1732 BYTE deviceid;
1733 - CARD16 control B16;
1734 - CARD32 pad02 B32;
1735 - CARD32 pad03 B32;
1736 - CARD32 pad04 B32;
1737 - CARD32 pad05 B32;
1738 - CARD32 pad06 B32;
1739 + CARD16 control;
1740 + CARD32 pad02;
1741 + CARD32 pad03;
1742 + CARD32 pad04;
1743 + CARD32 pad05;
1744 + CARD32 pad06;
1745 } devicePresenceNotify;
1748 @@ -1736,14 +1736,14 @@
1749 {
1750 BYTE type;
1751 BYTE state; /* NewValue or Deleted */
1752 - CARD16 sequenceNumber B16;
1753 - CARD32 time B32;
1754 - Atom atom B32; /* affected property */
1755 - CARD32 pad0 B32;
1756 - CARD32 pad1 B32;
1757 - CARD32 pad2 B32;
1758 - CARD32 pad3 B32;
1759 - CARD16 pad5 B16;
1760 + CARD16 sequenceNumber;
1761 + CARD32 time;
1762 + Atom atom; /* affected property */
1763 + CARD32 pad0;
1764 + CARD32 pad1;
1765 + CARD32 pad2;
1766 + CARD32 pad3;
1767 + CARD16 pad5;
1768 CARD8 pad4;
1769 CARD8 deviceid; /* id of device */
1770 } devicePropertyNotify;
1771 diff -u -r inputproto-2.3.2/inputproto.pc.in inputproto-2.4/inputproto.pc.in
1772 --- inputproto-2.3.2/inputproto.pc.in 2008-04-16 06:02:05.000000000 +0200
1773 +++ inputproto-2.4/inputproto.pc.in 2021-10-28 11:29:49.843887000 +0200
1774 @@ -1,9 +1,7 @@
1775 prefix=@prefix@
1776 -exec_prefix=@exec_prefix@
1777 -libdir=@libdir@
1778 includedir=@includedir@
1780 Name: InputProto
1781 Description: Input extension headers
1782 -Version: @PACKAGE_VERSION@
1783 +Version: 2.3.99.2
1784 Cflags: -I${includedir}