wok-current view xorg-fixesproto/stuff/fixesproto-6.0.patch @ rev 25634
Mass update, new toolchain gcc 8.3.0, glibc 2.28.0
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Sun Jan 14 08:12:37 2024 +0000 (20 months ago) |
| parents | |
| children |
line source
1 diff -u -r fixesproto-5.0/fixesproto.pc.in fixesproto-6.0/fixesproto.pc.in
2 --- fixesproto-5.0/fixesproto.pc.in 2010-11-15 22:29:42.000000000 +0100
3 +++ fixesproto-6.0/fixesproto.pc.in 2021-10-28 11:09:06.574704000 +0200
4 @@ -1,10 +1,8 @@
5 prefix=@prefix@
6 -exec_prefix=@exec_prefix@
7 -libdir=@libdir@
8 includedir=@includedir@
10 Name: FixesProto
11 Description: X Fixes extension headers
12 -Version: @PACKAGE_VERSION@
13 +Version: 6.0
14 Cflags: -I${includedir}
15 Requires: xextproto >= 7.0.99.1
16 diff -u -r fixesproto-5.0/fixesproto.txt fixesproto-6.0/fixesproto.txt
17 --- fixesproto-5.0/fixesproto.txt 2011-02-23 17:47:21.000000000 +0100
18 +++ fixesproto-6.0/fixesproto.txt 2021-10-28 11:09:22.137906000 +0200
19 @@ -190,7 +190,7 @@
20 Servers supporting the X Input Extension Version 2.0 or higher only
21 notify the clients of cursor change events for the ClientPointer, not
22 of any other master pointer (see Section 4.4. in the XI2 protocol
23 - specificiation).
24 + specification).
26 GetCursorImage
28 @@ -469,8 +469,8 @@
29 y-hot: CARD16
30 cursor-serial: CARD32
31 cursor-atom: ATOM
32 - cursor-name: LISTofCARD8
33 cursor-image: LISTofCARD32
34 + cursor-name: LISTofCARD8
36 This is similar to GetCursorImage except for including both
37 the atom and name of the current cursor.
38 @@ -525,20 +525,14 @@
40 A client sends this request to indicate that it wants the
41 cursor image to be hidden (i.e. to not be displayed) when
42 - the sprite is inside the specified window, or one of its
43 - subwindows. If the sprite is inside a window for which one
44 - or more active clients have requested cursor hiding then the
45 - cursor image will not be displayed.
46 + the sprite is on the same screen as the specified window.
47 + The sprite will be hidden if one or more clients have called
48 + HideCursor and not ShowCursor.
50 Note that even though cursor hiding causes the cursor image
51 to be invisible, CursorNotify events will still be sent
52 normally, as if the cursor image were visible.
54 - If, during a grab, one or more active clients have requested
55 - cursor hiding for grab window, or one of its ancestors, the
56 - cursor image of the grab cursor will not be displayed during
57 - the lifetime of that grab.
58 -
59 When a client with outstanding cursor hiding requests
60 terminates its connection these requests will be deleted.
62 @@ -552,13 +546,9 @@
63 window: WINDOW
65 A client sends this request to indicate that it wants the
66 - cursor image to be displayed when the sprite is inside the
67 - specified window, or one of its subwindows. If the sprite
68 - is inside a window for which no active clients have requested
69 - cursor hiding then the cursor image for that window will be
70 - displayed. In other words, if a client calls HideCursor for
71 - a specified window, or window subtree, this request reverses
72 - the effects of the HideCursor request.
73 + cursor image to be displayed when the sprite is on the same
74 + screen as the specified window. The sprite will be hidden
75 + if one or more clients have called HideCursor and not ShowCursor.
77 If the client has made no outstanding HideCursor requests
78 a BadMatch error is generated.
79 @@ -606,13 +596,13 @@
80 CreatePointerBarrier
82 barrier: BARRIER
83 - drawable: DRAWABLE
84 + window: Window
85 x1, y2, x2, y2: INT16
86 directions: CARD32
87 devices: LISTofDEVICEID
89 Creates a pointer barrier along the line specified by the given
90 - coordinates on the screen associated with the given drawable. The
91 + coordinates on the screen associated with the given window. The
92 barrier has no spatial extent; it is simply a line along the left
93 or top edge of the specified pixels. Barrier coordinates are in
94 screen space.
95 @@ -650,6 +640,63 @@
97 Errors: Barrier
99 +************* XFIXES VERSION 6 OR BETTER ***********
100 +
101 +13. Disconnect mode
102 +
103 +The X11 server is capable of terminating itself once all X11 clients are
104 +gone.
105 +
106 +Yet, in a typical user session, there are a number of X11 clients running
107 +continuously (e.g. Xsettings daemon, IBus, etc.). Those always-running
108 +clients will prevent the X11 server from terminating, because the actual
109 +number of X11 clients will never drop to 0.
110 +
111 +Disconnect mode allows the X11 clients themselves to specify that they
112 +should not be accounted for when checking the remaining clients prior
113 +to terminate the X11 server.
114 +
115 +This can be particularly useful for Wayland compositors which are able to
116 +start Xwayland on demand, as this allows Xwayland to terminate automatically
117 +when the relevant X11 clients have quit.
118 +
119 +13.1 Types
120 +
121 + XFixesClientDisconnectFlags
122 +
123 + XFixesClientDisconnectFlagDefault: 0
124 + XFixesClientDisconnectFlagTerminate: 1 << 0
125 +
126 + XFixesClientDisconnectFlagDefault is the default behavior for
127 + regular clients, i.e. the X11 server won't terminate as long as such
128 + clients are still connected.
129 +
130 + XFixesClientDisconnectFlagTerminate indicates to the X11 server that
131 + it can ignore the client and terminate itself even though the client
132 + is still connected to the X11 server.
133 +
134 +13.2 Requests
135 +
136 +SetClientDisconnectMode
137 +
138 + disconnect-mode: CARD32
139 +
140 + Sets the disconnect mode for the client.
141 +
142 + The disconnect-mode is a bit mask of XFixesClientDisconnectFlags.
143 +
144 +
145 +GetClientDisconnectMode
146 +
147 + Gets the disconnect mode for the client.
148 +
149 + ->
150 +
151 + disconnect-mode: CARD32
152 +
153 + The disconnect-mode is a bit mask of XFixesClientDisconnectFlags.
154 +
155 +
156 99. Future compatibility
158 This extension is not expected to remain fixed. Future changes will
159 diff -u -r fixesproto-5.0/xfixesproto.h fixesproto-6.0/xfixesproto.h
160 --- fixesproto-5.0/xfixesproto.h 2011-02-23 17:47:21.000000000 +0100
161 +++ fixesproto-6.0/xfixesproto.h 2021-10-28 11:09:54.950687000 +0200
162 @@ -69,18 +69,18 @@
163 typedef struct {
164 CARD8 reqType;
165 CARD8 xfixesReqType;
166 - CARD16 length B16;
167 + CARD16 length;
168 } xXFixesReq;
170 -/*
171 +/*
172 * requests and replies
173 */
174 typedef struct {
175 CARD8 reqType;
176 CARD8 xfixesReqType;
177 - CARD16 length B16;
178 - CARD32 majorVersion B32;
179 - CARD32 minorVersion B32;
180 + CARD16 length;
181 + CARD32 majorVersion;
182 + CARD32 minorVersion;
183 } xXFixesQueryVersionReq;
185 #define sz_xXFixesQueryVersionReq 12
186 @@ -88,14 +88,14 @@
187 typedef struct {
188 BYTE type; /* X_Reply */
189 BYTE pad1;
190 - CARD16 sequenceNumber B16;
191 - CARD32 length B32;
192 - CARD32 majorVersion B32;
193 - CARD32 minorVersion B32;
194 - CARD32 pad2 B32;
195 - CARD32 pad3 B32;
196 - CARD32 pad4 B32;
197 - CARD32 pad5 B32;
198 + CARD16 sequenceNumber;
199 + CARD32 length;
200 + CARD32 majorVersion;
201 + CARD32 minorVersion;
202 + CARD32 pad2;
203 + CARD32 pad3;
204 + CARD32 pad4;
205 + CARD32 pad5;
206 } xXFixesQueryVersionReply;
208 #define sz_xXFixesQueryVersionReply 32
209 @@ -103,7 +103,7 @@
210 typedef struct {
211 CARD8 reqType;
212 CARD8 xfixesReqType;
213 - CARD16 length B16;
214 + CARD16 length;
215 BYTE mode; /* SetModeInsert/SetModeDelete*/
216 BYTE target; /* SaveSetNearest/SaveSetRoot*/
217 BYTE map; /* SaveSetMap/SaveSetUnmap */
218 @@ -116,10 +116,10 @@
219 typedef struct {
220 CARD8 reqType;
221 CARD8 xfixesReqType;
222 - CARD16 length B16;
223 - Window window B32;
224 - Atom selection B32;
225 - CARD32 eventMask B32;
226 + CARD16 length;
227 + Window window;
228 + Atom selection;
229 + CARD32 eventMask;
230 } xXFixesSelectSelectionInputReq;
232 #define sz_xXFixesSelectSelectionInputReq 16
233 @@ -127,22 +127,22 @@
234 typedef struct {
235 CARD8 type;
236 CARD8 subtype;
237 - CARD16 sequenceNumber B16;
238 - Window window B32;
239 - Window owner B32;
240 - Atom selection B32;
241 - Time timestamp B32;
242 - Time selectionTimestamp B32;
243 - CARD32 pad2 B32;
244 - CARD32 pad3 B32;
245 + CARD16 sequenceNumber;
246 + Window window;
247 + Window owner;
248 + Atom selection;
249 + Time timestamp;
250 + Time selectionTimestamp;
251 + CARD32 pad2;
252 + CARD32 pad3;
253 } xXFixesSelectionNotifyEvent;
255 typedef struct {
256 CARD8 reqType;
257 CARD8 xfixesReqType;
258 - CARD16 length B16;
259 - Window window B32;
260 - CARD32 eventMask B32;
261 + CARD16 length;
262 + Window window;
263 + CARD32 eventMask;
264 } xXFixesSelectCursorInputReq;
266 #define sz_xXFixesSelectCursorInputReq 12
267 @@ -150,20 +150,20 @@
268 typedef struct {
269 CARD8 type;
270 CARD8 subtype;
271 - CARD16 sequenceNumber B16;
272 - Window window B32;
273 - CARD32 cursorSerial B32;
274 + CARD16 sequenceNumber;
275 + Window window;
276 + CARD32 cursorSerial;
277 Time timestamp;
278 - Atom name B32; /* Version 2 */
279 - CARD32 pad1 B32;
280 - CARD32 pad2 B32;
281 - CARD32 pad3 B32;
282 + Atom name; /* Version 2 */
283 + CARD32 pad1;
284 + CARD32 pad2;
285 + CARD32 pad3;
286 } xXFixesCursorNotifyEvent;
288 typedef struct {
289 CARD8 reqType;
290 CARD8 xfixesReqType;
291 - CARD16 length B16;
292 + CARD16 length;
293 } xXFixesGetCursorImageReq;
295 #define sz_xXFixesGetCursorImageReq 4
296 @@ -171,17 +171,17 @@
297 typedef struct {
298 BYTE type; /* X_Reply */
299 BYTE pad1;
300 - CARD16 sequenceNumber B16;
301 - CARD32 length B32;
302 - INT16 x B16;
303 - INT16 y B16;
304 - CARD16 width B16;
305 - CARD16 height B16;
306 - CARD16 xhot B16;
307 - CARD16 yhot B16;
308 - CARD32 cursorSerial B32;
309 - CARD32 pad2 B32;
310 - CARD32 pad3 B32;
311 + CARD16 sequenceNumber;
312 + CARD32 length;
313 + INT16 x;
314 + INT16 y;
315 + CARD16 width;
316 + CARD16 height;
317 + CARD16 xhot;
318 + CARD16 yhot;
319 + CARD32 cursorSerial;
320 + CARD32 pad2;
321 + CARD32 pad3;
322 } xXFixesGetCursorImageReply;
324 #define sz_xXFixesGetCursorImageReply 32
325 @@ -193,8 +193,8 @@
326 typedef struct {
327 CARD8 reqType;
328 CARD8 xfixesReqType;
329 - CARD16 length B16;
330 - Region region B32;
331 + CARD16 length;
332 + Region region;
333 /* LISTofRECTANGLE */
334 } xXFixesCreateRegionReq;
336 @@ -203,9 +203,9 @@
337 typedef struct {
338 CARD8 reqType;
339 CARD8 xfixesReqType;
340 - CARD16 length B16;
341 - Region region B32;
342 - Pixmap bitmap B32;
343 + CARD16 length;
344 + Region region;
345 + Pixmap bitmap;
346 } xXFixesCreateRegionFromBitmapReq;
348 #define sz_xXFixesCreateRegionFromBitmapReq 12
349 @@ -213,12 +213,12 @@
350 typedef struct {
351 CARD8 reqType;
352 CARD8 xfixesReqType;
353 - CARD16 length B16;
354 - Region region B32;
355 - Window window B32;
356 + CARD16 length;
357 + Region region;
358 + Window window;
359 CARD8 kind;
360 CARD8 pad1;
361 - CARD16 pad2 B16;
362 + CARD16 pad2;
363 } xXFixesCreateRegionFromWindowReq;
365 #define sz_xXFixesCreateRegionFromWindowReq 16
366 @@ -226,9 +226,9 @@
367 typedef struct {
368 CARD8 reqType;
369 CARD8 xfixesReqType;
370 - CARD16 length B16;
371 - Region region B32;
372 - GContext gc B32;
373 + CARD16 length;
374 + Region region;
375 + GContext gc;
376 } xXFixesCreateRegionFromGCReq;
378 #define sz_xXFixesCreateRegionFromGCReq 12
379 @@ -236,9 +236,9 @@
380 typedef struct {
381 CARD8 reqType;
382 CARD8 xfixesReqType;
383 - CARD16 length B16;
384 - Region region B32;
385 - Picture picture B32;
386 + CARD16 length;
387 + Region region;
388 + Picture picture;
389 } xXFixesCreateRegionFromPictureReq;
391 #define sz_xXFixesCreateRegionFromPictureReq 12
392 @@ -246,8 +246,8 @@
393 typedef struct {
394 CARD8 reqType;
395 CARD8 xfixesReqType;
396 - CARD16 length B16;
397 - Region region B32;
398 + CARD16 length;
399 + Region region;
400 } xXFixesDestroyRegionReq;
402 #define sz_xXFixesDestroyRegionReq 8
403 @@ -255,8 +255,8 @@
404 typedef struct {
405 CARD8 reqType;
406 CARD8 xfixesReqType;
407 - CARD16 length B16;
408 - Region region B32;
409 + CARD16 length;
410 + Region region;
411 /* LISTofRECTANGLE */
412 } xXFixesSetRegionReq;
414 @@ -265,9 +265,9 @@
415 typedef struct {
416 CARD8 reqType;
417 CARD8 xfixesReqType;
418 - CARD16 length B16;
419 - Region source B32;
420 - Region destination B32;
421 + CARD16 length;
422 + Region source;
423 + Region destination;
424 } xXFixesCopyRegionReq;
426 #define sz_xXFixesCopyRegionReq 12
427 @@ -275,10 +275,10 @@
428 typedef struct {
429 CARD8 reqType;
430 CARD8 xfixesReqType;
431 - CARD16 length B16;
432 - Region source1 B32;
433 - Region source2 B32;
434 - Region destination B32;
435 + CARD16 length;
436 + Region source1;
437 + Region source2;
438 + Region destination;
439 } xXFixesCombineRegionReq,
440 xXFixesUnionRegionReq,
441 xXFixesIntersectRegionReq,
442 @@ -292,11 +292,11 @@
443 typedef struct {
444 CARD8 reqType;
445 CARD8 xfixesReqType;
446 - CARD16 length B16;
447 - Region source B32;
448 - INT16 x B16, y B16;
449 - CARD16 width B16, height B16;
450 - Region destination B32;
451 + CARD16 length;
452 + Region source;
453 + INT16 x, y;
454 + CARD16 width, height;
455 + Region destination;
456 } xXFixesInvertRegionReq;
458 #define sz_xXFixesInvertRegionReq 20
459 @@ -304,19 +304,19 @@
460 typedef struct {
461 CARD8 reqType;
462 CARD8 xfixesReqType;
463 - CARD16 length B16;
464 - Region region B32;
465 - INT16 dx B16, dy B16;
466 + CARD16 length;
467 + Region region;
468 + INT16 dx, dy;
469 } xXFixesTranslateRegionReq;
471 #define sz_xXFixesTranslateRegionReq 12
472 -
473 +
474 typedef struct {
475 CARD8 reqType;
476 CARD8 xfixesReqType;
477 - CARD16 length B16;
478 - Region source B32;
479 - Region destination B32;
480 + CARD16 length;
481 + Region source;
482 + Region destination;
483 } xXFixesRegionExtentsReq;
485 #define sz_xXFixesRegionExtentsReq 12
486 @@ -324,8 +324,8 @@
487 typedef struct {
488 CARD8 reqType;
489 CARD8 xfixesReqType;
490 - CARD16 length B16;
491 - Region region B32;
492 + CARD16 length;
493 + Region region;
494 } xXFixesFetchRegionReq;
496 #define sz_xXFixesFetchRegionReq 8
497 @@ -333,14 +333,14 @@
498 typedef struct {
499 BYTE type; /* X_Reply */
500 BYTE pad1;
501 - CARD16 sequenceNumber B16;
502 - CARD32 length B32;
503 - INT16 x B16, y B16;
504 - CARD16 width B16, height B16;
505 - CARD32 pad2 B32;
506 - CARD32 pad3 B32;
507 - CARD32 pad4 B32;
508 - CARD32 pad5 B32;
509 + CARD16 sequenceNumber;
510 + CARD32 length;
511 + INT16 x, y;
512 + CARD16 width, height;
513 + CARD32 pad2;
514 + CARD32 pad3;
515 + CARD32 pad4;
516 + CARD32 pad5;
517 } xXFixesFetchRegionReply;
519 #define sz_xXFixesFetchRegionReply 32
520 @@ -348,10 +348,10 @@
521 typedef struct {
522 CARD8 reqType;
523 CARD8 xfixesReqType;
524 - CARD16 length B16;
525 - GContext gc B32;
526 - Region region B32;
527 - INT16 xOrigin B16, yOrigin B16;
528 + CARD16 length;
529 + GContext gc;
530 + Region region;
531 + INT16 xOrigin, yOrigin;
532 } xXFixesSetGCClipRegionReq;
534 #define sz_xXFixesSetGCClipRegionReq 16
535 @@ -359,12 +359,12 @@
536 typedef struct {
537 CARD8 reqType;
538 CARD8 xfixesReqType;
539 - CARD16 length B16;
540 + CARD16 length;
541 Window dest;
542 BYTE destKind;
543 CARD8 pad1;
544 - CARD16 pad2 B16;
545 - INT16 xOff B16, yOff B16;
546 + CARD16 pad2;
547 + INT16 xOff, yOff;
548 Region region;
549 } xXFixesSetWindowShapeRegionReq;
551 @@ -373,10 +373,10 @@
552 typedef struct {
553 CARD8 reqType;
554 CARD8 xfixesReqType;
555 - CARD16 length B16;
556 - Picture picture B32;
557 - Region region B32;
558 - INT16 xOrigin B16, yOrigin B16;
559 + CARD16 length;
560 + Picture picture;
561 + Region region;
562 + INT16 xOrigin, yOrigin;
563 } xXFixesSetPictureClipRegionReq;
565 #define sz_xXFixesSetPictureClipRegionReq 16
566 @@ -384,10 +384,10 @@
567 typedef struct {
568 CARD8 reqType;
569 CARD8 xfixesReqType;
570 - CARD16 length B16;
571 - Cursor cursor B32;
572 - CARD16 nbytes B16;
573 - CARD16 pad B16;
574 + CARD16 length;
575 + Cursor cursor;
576 + CARD16 nbytes;
577 + CARD16 pad;
578 } xXFixesSetCursorNameReq;
580 #define sz_xXFixesSetCursorNameReq 12
581 @@ -395,8 +395,8 @@
582 typedef struct {
583 CARD8 reqType;
584 CARD8 xfixesReqType;
585 - CARD16 length B16;
586 - Cursor cursor B32;
587 + CARD16 length;
588 + Cursor cursor;
589 } xXFixesGetCursorNameReq;
591 #define sz_xXFixesGetCursorNameReq 8
592 @@ -404,15 +404,15 @@
593 typedef struct {
594 BYTE type; /* X_Reply */
595 BYTE pad1;
596 - CARD16 sequenceNumber B16;
597 - CARD32 length B32;
598 - Atom atom B32;
599 - CARD16 nbytes B16;
600 - CARD16 pad2 B16;
601 - CARD32 pad3 B32;
602 - CARD32 pad4 B32;
603 - CARD32 pad5 B32;
604 - CARD32 pad6 B32;
605 + CARD16 sequenceNumber;
606 + CARD32 length;
607 + Atom atom;
608 + CARD16 nbytes;
609 + CARD16 pad2;
610 + CARD32 pad3;
611 + CARD32 pad4;
612 + CARD32 pad5;
613 + CARD32 pad6;
614 } xXFixesGetCursorNameReply;
616 #define sz_xXFixesGetCursorNameReply 32
617 @@ -420,7 +420,7 @@
618 typedef struct {
619 CARD8 reqType;
620 CARD8 xfixesReqType;
621 - CARD16 length B16;
622 + CARD16 length;
623 } xXFixesGetCursorImageAndNameReq;
625 #define sz_xXFixesGetCursorImageAndNameReq 4
626 @@ -428,18 +428,18 @@
627 typedef struct {
628 BYTE type; /* X_Reply */
629 BYTE pad1;
630 - CARD16 sequenceNumber B16;
631 - CARD32 length B32;
632 - INT16 x B16;
633 - INT16 y B16;
634 - CARD16 width B16;
635 - CARD16 height B16;
636 - CARD16 xhot B16;
637 - CARD16 yhot B16;
638 - CARD32 cursorSerial B32;
639 - Atom cursorName B32;
640 - CARD16 nbytes B16;
641 - CARD16 pad B16;
642 + CARD16 sequenceNumber;
643 + CARD32 length;
644 + INT16 x;
645 + INT16 y;
646 + CARD16 width;
647 + CARD16 height;
648 + CARD16 xhot;
649 + CARD16 yhot;
650 + CARD32 cursorSerial;
651 + Atom cursorName;
652 + CARD16 nbytes;
653 + CARD16 pad;
654 } xXFixesGetCursorImageAndNameReply;
656 #define sz_xXFixesGetCursorImageAndNameReply 32
657 @@ -447,9 +447,9 @@
658 typedef struct {
659 CARD8 reqType;
660 CARD8 xfixesReqType;
661 - CARD16 length B16;
662 - Cursor source B32;
663 - Cursor destination B32;
664 + CARD16 length;
665 + Cursor source;
666 + Cursor destination;
667 } xXFixesChangeCursorReq;
669 #define sz_xXFixesChangeCursorReq 12
670 @@ -457,8 +457,8 @@
671 typedef struct {
672 CARD8 reqType;
673 CARD8 xfixesReqType;
674 - CARD16 length B16;
675 - Cursor source B32;
676 + CARD16 length;
677 + Cursor source;
678 CARD16 nbytes;
679 CARD16 pad;
680 } xXFixesChangeCursorByNameReq;
681 @@ -470,13 +470,13 @@
682 typedef struct {
683 CARD8 reqType;
684 CARD8 xfixesReqType;
685 - CARD16 length B16;
686 - Region source B32;
687 - Region destination B32;
688 - CARD16 left B16;
689 - CARD16 right B16;
690 - CARD16 top B16;
691 - CARD16 bottom B16;
692 + CARD16 length;
693 + Region source;
694 + Region destination;
695 + CARD16 left;
696 + CARD16 right;
697 + CARD16 top;
698 + CARD16 bottom;
699 } xXFixesExpandRegionReq;
701 #define sz_xXFixesExpandRegionReq 20
702 @@ -486,8 +486,8 @@
703 typedef struct {
704 CARD8 reqType;
705 CARD8 xfixesReqType;
706 - CARD16 length B16;
707 - Window window B32;
708 + CARD16 length;
709 + Window window;
710 } xXFixesHideCursorReq;
712 #define sz_xXFixesHideCursorReq sizeof(xXFixesHideCursorReq)
713 @@ -495,8 +495,8 @@
714 typedef struct {
715 CARD8 reqType;
716 CARD8 xfixesReqType;
717 - CARD16 length B16;
718 - Window window B32;
719 + CARD16 length;
720 + Window window;
721 } xXFixesShowCursorReq;
723 #define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq)
724 @@ -508,16 +508,16 @@
725 typedef struct {
726 CARD8 reqType;
727 CARD8 xfixesReqType;
728 - CARD16 length B16;
729 - Barrier barrier B32;
730 - Window window B32;
731 - INT16 x1 B16;
732 - INT16 y1 B16;
733 - INT16 x2 B16;
734 - INT16 y2 B16;
735 + CARD16 length;
736 + Barrier barrier;
737 + Window window;
738 + INT16 x1;
739 + INT16 y1;
740 + INT16 x2;
741 + INT16 y2;
742 CARD32 directions;
743 - CARD16 pad B16;
744 - CARD16 num_devices B16;
745 + CARD16 pad;
746 + CARD16 num_devices;
747 /* array of CARD16 devices */
748 } xXFixesCreatePointerBarrierReq;
750 @@ -526,12 +526,46 @@
751 typedef struct {
752 CARD8 reqType;
753 CARD8 xfixesReqType;
754 - CARD16 length B16;
755 - Barrier barrier B32;
756 + CARD16 length;
757 + Barrier barrier;
758 } xXFixesDestroyPointerBarrierReq;
760 #define sz_xXFixesDestroyPointerBarrierReq 8
762 +/*************** Version 6.0 ******************/
763 +
764 +typedef struct {
765 + CARD8 reqType;
766 + CARD8 xfixesReqType;
767 + CARD16 length;
768 + CARD32 disconnect_mode;
769 +} xXFixesSetClientDisconnectModeReq;
770 +
771 +#define sz_xXFixesSetClientDisconnectModeReq 8
772 +
773 +typedef struct {
774 + CARD8 reqType;
775 + CARD8 xfixesReqType;
776 + CARD16 length;
777 +} xXFixesGetClientDisconnectModeReq;
778 +
779 +#define sz_xXFixesGetClientDisconnectModeReq 4
780 +
781 +typedef struct {
782 + BYTE type; /* X_Reply */
783 + CARD8 pad0;
784 + CARD16 sequenceNumber;
785 + CARD32 length;
786 + CARD32 disconnect_mode;
787 + CARD32 pad1;
788 + CARD32 pad2;
789 + CARD32 pad3;
790 + CARD32 pad4;
791 + CARD32 pad5;
792 +} xXFixesGetClientDisconnectModeReply;
793 +
794 +#define sz_xXFixesGetClientDisconnectModeReply 32
795 +
796 #undef Barrier
797 #undef Region
798 #undef Picture
799 diff -u -r fixesproto-5.0/xfixeswire.h fixesproto-6.0/xfixeswire.h
800 --- fixesproto-5.0/xfixeswire.h 2011-02-23 17:47:21.000000000 +0100
801 +++ fixesproto-6.0/xfixeswire.h 2021-10-28 11:10:15.562761000 +0200
802 @@ -48,7 +48,7 @@
803 #define _XFIXESWIRE_H_
805 #define XFIXES_NAME "XFIXES"
806 -#define XFIXES_MAJOR 5
807 +#define XFIXES_MAJOR 6
808 #define XFIXES_MINOR 0
810 /*************** Version 1 ******************/
811 @@ -89,8 +89,11 @@
812 /*************** Version 5 ******************/
813 #define X_XFixesCreatePointerBarrier 31
814 #define X_XFixesDestroyPointerBarrier 32
815 +/*************** Version 6 ******************/
816 +#define X_XFixesSetClientDisconnectMode 33
817 +#define X_XFixesGetClientDisconnectMode 34
819 -#define XFixesNumberRequests (X_XFixesDestroyPointerBarrier+1)
820 +#define XFixesNumberRequests (X_XFixesGetClientDisconnectMode+1)
822 /* Selection events share one event number */
823 #define XFixesSelectionNotify 0
824 @@ -136,4 +139,11 @@
825 #define BarrierNegativeX (1L << 2)
826 #define BarrierNegativeY (1L << 3)
828 +/*************** Version 6 ******************/
829 +
830 +/* The default server behaviour */
831 +#define XFixesClientDisconnectFlagDefault 0
832 +/* The server may disconnect this client to shut down */
833 +#define XFixesClientDisconnectFlagTerminate (1L << 0)
834 +
835 #endif /* _XFIXESWIRE_H_ */