[PATCH xorgproto 1/2] Remove the use of no-op B16 & B32 bitfield macros in headers
Alan Coopersmith
alan.coopersmith at oracle.com
Sun Jun 17 16:55:58 UTC 2018
These have always done nothing on all platforms except CRAY.
As https://bugs.freedesktop.org/show_bug.cgi?id=45202 points out
we don't even detect when they've been wrong for decades.
Performed via:
find include -name '*.h' | grep -v md.h | xargs perl -i -p -e 's{\s+B\d+}{}g'
followed by manual whitespace fixups to preserve visual alignment.
The #defines for B16 & B32 are left in place to preserve compatibility
in any code that used them outside the xorgproto repo.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
include/GL/glxproto.h | 1210 ++++++++++++-------------
include/X11/PM/PMproto.h | 10 +-
include/X11/XWDFile.h | 58 +-
include/X11/Xproto.h | 1454 +++++++++++++++---------------
include/X11/Xprotostr.h | 14 +-
include/X11/dri/xf86driproto.h | 256 +++---
include/X11/extensions/EVIproto.h | 46 +-
include/X11/extensions/Printstr.h | 340 +++----
include/X11/extensions/XIproto.h | 830 ++++++++---------
include/X11/extensions/XKBproto.h | 890 +++++++++---------
include/X11/extensions/XResproto.h | 136 +--
include/X11/extensions/XvMCproto.h | 198 ++--
include/X11/extensions/Xvproto.h | 504 +++++------
include/X11/extensions/agproto.h | 86 +-
include/X11/extensions/applewmproto.h | 178 ++--
include/X11/extensions/bigreqsproto.h | 22 +-
include/X11/extensions/compositeproto.h | 80 +-
include/X11/extensions/cupproto.h | 64 +-
include/X11/extensions/damageproto.h | 58 +-
include/X11/extensions/dbeproto.h | 88 +-
include/X11/extensions/dmxproto.h | 306 +++----
include/X11/extensions/dpmsproto.h | 102 +--
include/X11/extensions/dri2proto.h | 286 +++---
include/X11/extensions/dri3proto.h | 180 ++--
include/X11/extensions/evieproto.h | 104 +--
include/X11/extensions/fontcachstr.h | 88 +-
include/X11/extensions/geproto.h | 26 +-
include/X11/extensions/lbxproto.h | 508 +++++------
include/X11/extensions/lgewire.h | 30 +-
include/X11/extensions/mitmiscproto.h | 20 +-
include/X11/extensions/multibufproto.h | 202 ++---
include/X11/extensions/panoramiXproto.h | 128 +--
include/X11/extensions/presentproto.h | 174 ++--
include/X11/extensions/randrproto.h | 978 ++++++++++----------
include/X11/extensions/recordproto.h | 114 +--
include/X11/extensions/renderproto.h | 392 ++++----
include/X11/extensions/saverproto.h | 84 +-
include/X11/extensions/securproto.h | 70 +-
include/X11/extensions/shapeproto.h | 156 ++--
include/X11/extensions/shmproto.h | 154 ++--
include/X11/extensions/syncproto.h | 244 ++---
include/X11/extensions/windowswmstr.h | 116 +--
include/X11/extensions/xcalibrateproto.h | 62 +-
include/X11/extensions/xcmiscproto.h | 62 +-
include/X11/extensions/xf86bigfproto.h | 54 +-
include/X11/extensions/xf86dga1proto.h | 158 ++--
include/X11/extensions/xf86dgaproto.h | 312 +++----
include/X11/extensions/xf86mscstr.h | 198 ++--
include/X11/extensions/xf86rushstr.h | 132 +--
include/X11/extensions/xf86vmproto.h | 602 ++++++-------
include/X11/extensions/xfixesproto.h | 320 +++----
include/X11/extensions/xtestext1proto.h | 62 +-
include/X11/extensions/xtestproto.h | 64 +-
include/X11/extensions/xtrapddmi.h | 4 +-
include/X11/extensions/xtrapdi.h | 126 +--
include/X11/extensions/xtraplib.h | 2 +-
include/X11/fonts/FSproto.h | 402 ++++-----
57 files changed, 6772 insertions(+), 6772 deletions(-)
diff --git a/include/GL/glxproto.h b/include/GL/glxproto.h
index 2766bf8..736fb58 100644
--- a/include/GL/glxproto.h
+++ b/include/GL/glxproto.h
@@ -127,8 +127,8 @@ typedef CARD32 GLXContextTag;
typedef struct GLXRender {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
+ CARD16 length;
+ GLXContextTag contextTag;
} xGLXRenderReq;
#define sz_xGLXRenderReq 8
@@ -147,11 +147,11 @@ typedef struct GLXRender {
typedef struct GLXRenderLarge {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
- CARD16 requestNumber B16;
- CARD16 requestTotal B16;
- CARD32 dataBytes B32;
+ CARD16 length;
+ GLXContextTag contextTag;
+ CARD16 requestNumber;
+ CARD16 requestTotal;
+ CARD32 dataBytes;
} xGLXRenderLargeReq;
#define sz_xGLXRenderLargeReq 16
@@ -163,8 +163,8 @@ typedef struct GLXRenderLarge {
typedef struct GLXSingle {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
+ CARD16 length;
+ GLXContextTag contextTag;
} xGLXSingleReq;
#define sz_xGLXSingleReq 8
@@ -174,9 +174,9 @@ typedef struct GLXSingle {
typedef struct GLXQueryVersion {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xGLXQueryVersionReq;
#define sz_xGLXQueryVersionReq 12
@@ -186,8 +186,8 @@ typedef struct GLXQueryVersion {
typedef struct GLXIsDirect {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
+ CARD16 length;
+ GLXContextID context;
} xGLXIsDirectReq;
#define sz_xGLXIsDirectReq 8
@@ -197,14 +197,14 @@ typedef struct GLXIsDirect {
typedef struct GLXCreateContext {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
- CARD32 visual B32;
- CARD32 screen B32;
- GLXContextID shareList B32;
+ CARD16 length;
+ GLXContextID context;
+ CARD32 visual;
+ CARD32 screen;
+ GLXContextID shareList;
BOOL isDirect;
CARD8 reserved1;
- CARD16 reserved2 B16;
+ CARD16 reserved2;
} xGLXCreateContextReq;
#define sz_xGLXCreateContextReq 24
@@ -214,8 +214,8 @@ typedef struct GLXCreateContext {
typedef struct GLXDestroyContext {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
+ CARD16 length;
+ GLXContextID context;
} xGLXDestroyContextReq;
#define sz_xGLXDestroyContextReq 8
@@ -225,10 +225,10 @@ typedef struct GLXDestroyContext {
typedef struct GLXMakeCurrent {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXDrawable drawable B32;
- GLXContextID context B32;
- GLXContextTag oldContextTag B32;
+ CARD16 length;
+ GLXDrawable drawable;
+ GLXContextID context;
+ GLXContextTag oldContextTag;
} xGLXMakeCurrentReq;
#define sz_xGLXMakeCurrentReq 16
@@ -238,8 +238,8 @@ typedef struct GLXMakeCurrent {
typedef struct GLXWaitGL {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
+ CARD16 length;
+ GLXContextTag contextTag;
} xGLXWaitGLReq;
#define sz_xGLXWaitGLReq 8
@@ -249,8 +249,8 @@ typedef struct GLXWaitGL {
typedef struct GLXWaitX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
+ CARD16 length;
+ GLXContextTag contextTag;
} xGLXWaitXReq;
#define sz_xGLXWaitXReq 8
@@ -260,11 +260,11 @@ typedef struct GLXWaitX {
typedef struct GLXCopyContext {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID source B32;
- GLXContextID dest B32;
- CARD32 mask B32;
- GLXContextTag contextTag B32;
+ CARD16 length;
+ GLXContextID source;
+ GLXContextID dest;
+ CARD32 mask;
+ GLXContextTag contextTag;
} xGLXCopyContextReq;
#define sz_xGLXCopyContextReq 20
@@ -274,9 +274,9 @@ typedef struct GLXCopyContext {
typedef struct GLXSwapBuffers {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
- GLXDrawable drawable B32;
+ CARD16 length;
+ GLXContextTag contextTag;
+ GLXDrawable drawable;
} xGLXSwapBuffersReq;
#define sz_xGLXSwapBuffersReq 12
@@ -286,12 +286,12 @@ typedef struct GLXSwapBuffers {
typedef struct GLXUseXFont {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag contextTag B32;
- CARD32 font B32;
- CARD32 first B32;
- CARD32 count B32;
- CARD32 listBase B32;
+ CARD16 length;
+ GLXContextTag contextTag;
+ CARD32 font;
+ CARD32 first;
+ CARD32 count;
+ CARD32 listBase;
} xGLXUseXFontReq;
#define sz_xGLXUseXFontReq 24
@@ -301,11 +301,11 @@ typedef struct GLXUseXFont {
typedef struct GLXCreateGLXPixmap {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 visual B32;
- CARD32 pixmap B32;
- GLXPixmap glxpixmap B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 visual;
+ CARD32 pixmap;
+ GLXPixmap glxpixmap;
} xGLXCreateGLXPixmapReq;
#define sz_xGLXCreateGLXPixmapReq 20
@@ -315,8 +315,8 @@ typedef struct GLXCreateGLXPixmap {
typedef struct GLXDestroyGLXPixmap {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXPixmap glxpixmap B32;
+ CARD16 length;
+ GLXPixmap glxpixmap;
} xGLXDestroyGLXPixmapReq;
#define sz_xGLXDestroyGLXPixmapReq 8
@@ -326,8 +326,8 @@ typedef struct GLXDestroyGLXPixmap {
typedef struct GLXGetVisualConfigs {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xGLXGetVisualConfigsReq;
#define sz_xGLXGetVisualConfigsReq 8
@@ -337,9 +337,9 @@ typedef struct GLXGetVisualConfigs {
typedef struct GLXVendorPrivate {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- GLXContextTag contextTag B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ GLXContextTag contextTag;
/*
** More data may follow; this is just the header.
*/
@@ -352,9 +352,9 @@ typedef struct GLXVendorPrivate {
typedef struct GLXVendorPrivateWithReply {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- GLXContextTag contextTag B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ GLXContextTag contextTag;
/*
** More data may follow; this is just the header.
*/
@@ -367,8 +367,8 @@ typedef struct GLXVendorPrivateWithReply {
typedef struct GLXQueryExtensionsString {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xGLXQueryExtensionsStringReq;
#define sz_xGLXQueryExtensionsStringReq 8
@@ -378,9 +378,9 @@ typedef struct GLXQueryExtensionsString {
typedef struct GLXQueryServerString {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 name B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 name;
} xGLXQueryServerStringReq;
#define sz_xGLXQueryServerStringReq 12
@@ -390,10 +390,10 @@ typedef struct GLXQueryServerString {
typedef struct GLXClientInfo {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 major B32;
- CARD32 minor B32;
- CARD32 numbytes B32;
+ CARD16 length;
+ CARD32 major;
+ CARD32 minor;
+ CARD32 numbytes;
} xGLXClientInfoReq;
#define sz_xGLXClientInfoReq 16
@@ -405,8 +405,8 @@ typedef struct GLXClientInfo {
typedef struct GLXGetFBConfigs {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xGLXGetFBConfigsReq;
#define sz_xGLXGetFBConfigsReq 8
@@ -416,12 +416,12 @@ typedef struct GLXGetFBConfigs {
typedef struct GLXCreatePixmap {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
- GLXFBConfigID fbconfig B32;
- CARD32 pixmap B32;
- GLXPixmap glxpixmap B32;
- CARD32 numAttribs B32;
+ CARD16 length;
+ CARD32 screen;
+ GLXFBConfigID fbconfig;
+ CARD32 pixmap;
+ GLXPixmap glxpixmap;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXCreatePixmapReq;
#define sz_xGLXCreatePixmapReq 24
@@ -432,8 +432,8 @@ typedef struct GLXCreatePixmap {
typedef struct GLXDestroyPixmap {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXPixmap glxpixmap B32;
+ CARD16 length;
+ GLXPixmap glxpixmap;
} xGLXDestroyPixmapReq;
#define sz_xGLXDestroyPixmapReq 8
@@ -443,15 +443,15 @@ typedef struct GLXDestroyPixmap {
typedef struct GLXCreateNewContext {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
- GLXFBConfigID fbconfig B32;
- CARD32 screen B32;
+ CARD16 length;
+ GLXContextID context;
+ GLXFBConfigID fbconfig;
+ CARD32 screen;
CARD32 renderType;
- GLXContextID shareList B32;
+ GLXContextID shareList;
BOOL isDirect;
CARD8 reserved1;
- CARD16 reserved2 B16;
+ CARD16 reserved2;
} xGLXCreateNewContextReq;
#define sz_xGLXCreateNewContextReq 28
@@ -461,8 +461,8 @@ typedef struct GLXCreateNewContext {
typedef struct GLXQueryContext {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
+ CARD16 length;
+ GLXContextID context;
} xGLXQueryContextReq;
#define sz_xGLXQueryContextReq 8
@@ -472,11 +472,11 @@ typedef struct GLXQueryContext {
typedef struct GLXMakeContextCurrent {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextTag oldContextTag B32;
- GLXDrawable drawable B32;
- GLXDrawable readdrawable B32;
- GLXContextID context B32;
+ CARD16 length;
+ GLXContextTag oldContextTag;
+ GLXDrawable drawable;
+ GLXDrawable readdrawable;
+ GLXContextID context;
} xGLXMakeContextCurrentReq;
#define sz_xGLXMakeContextCurrentReq 20
@@ -486,11 +486,11 @@ typedef struct GLXMakeContextCurrent {
typedef struct GLXCreatePbuffer {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
- GLXFBConfigID fbconfig B32;
- GLXPbuffer pbuffer B32;
- CARD32 numAttribs B32;
+ CARD16 length;
+ CARD32 screen;
+ GLXFBConfigID fbconfig;
+ GLXPbuffer pbuffer;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXCreatePbufferReq;
#define sz_xGLXCreatePbufferReq 20
@@ -501,8 +501,8 @@ typedef struct GLXCreatePbuffer {
typedef struct GLXDestroyPbuffer {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXPbuffer pbuffer B32;
+ CARD16 length;
+ GLXPbuffer pbuffer;
} xGLXDestroyPbufferReq;
#define sz_xGLXDestroyPbufferReq 8
@@ -512,8 +512,8 @@ typedef struct GLXDestroyPbuffer {
typedef struct GLXGetDrawableAttributes {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXDrawable drawable B32;
+ CARD16 length;
+ GLXDrawable drawable;
} xGLXGetDrawableAttributesReq;
#define sz_xGLXGetDrawableAttributesReq 8
@@ -523,9 +523,9 @@ typedef struct GLXGetDrawableAttributes {
typedef struct GLXChangeDrawableAttributes {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXDrawable drawable B32;
- CARD32 numAttribs B32;
+ CARD16 length;
+ GLXDrawable drawable;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXChangeDrawableAttributesReq;
#define sz_xGLXChangeDrawableAttributesReq 12
@@ -536,12 +536,12 @@ typedef struct GLXChangeDrawableAttributes {
typedef struct GLXCreateWindow {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 screen B32;
- GLXFBConfigID fbconfig B32;
- CARD32 window B32;
- GLXWindow glxwindow B32;
- CARD32 numAttribs B32;
+ CARD16 length;
+ CARD32 screen;
+ GLXFBConfigID fbconfig;
+ CARD32 window;
+ GLXWindow glxwindow;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXCreateWindowReq;
#define sz_xGLXCreateWindowReq 24
@@ -552,8 +552,8 @@ typedef struct GLXCreateWindow {
typedef struct GLXDestroyWindow {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXWindow glxwindow B32;
+ CARD16 length;
+ GLXWindow glxwindow;
} xGLXDestroyWindowReq;
#define sz_xGLXDestroyWindowReq 8
@@ -562,170 +562,170 @@ typedef struct GLXDestroyWindow {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 error B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 error;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetErrorReply;
#define sz_xGLXGetErrorReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- GLXContextTag contextTag B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ GLXContextTag contextTag;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXMakeCurrentReply;
#define sz_xGLXMakeCurrentReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXReadPixelsReply;
#define sz_xGLXReadPixelsReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 depth B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 width;
+ CARD32 height;
+ CARD32 depth;
+ CARD32 pad6;
} xGLXGetTexImageReply;
#define sz_xGLXGetTexImageReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 width;
+ CARD32 height;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetSeparableFilterReply;
#define sz_xGLXGetSeparableFilterReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 width;
+ CARD32 height;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetConvolutionFilterReply;
#define sz_xGLXGetConvolutionFilterReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 width B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 width;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetHistogramReply;
#define sz_xGLXGetHistogramReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetMinmaxReply;
#define sz_xGLXGetMinmaxReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 retval B32;
- CARD32 size B32;
- CARD32 newMode B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 retval;
+ CARD32 size;
+ CARD32 newMode;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXRenderModeReply;
#define sz_xGLXRenderModeReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryVersionReply;
#define sz_xGLXQueryVersionReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numVisuals B32;
- CARD32 numProps B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numVisuals;
+ CARD32 numProps;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetVisualConfigsReply;
#define sz_xGLXGetVisualConfigsReply 32
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL isDirect;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGLXIsDirectReply;
#define sz_xGLXIsDirectReply 32
@@ -737,14 +737,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 retval B32;
- CARD32 size B32;
- CARD32 pad3 B32; /* NOTE: may hold a single value */
- CARD32 pad4 B32; /* NOTE: may hold half a double */
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 retval;
+ CARD32 size;
+ CARD32 pad3; /* NOTE: may hold a single value */
+ CARD32 pad4; /* NOTE: may hold half a double */
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXSingleReply;
#define sz_xGLXSingleReply 32
@@ -757,14 +757,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 retval B32;
- CARD32 size B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 retval;
+ CARD32 size;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXVendorPrivReply;
#define sz_xGLXVendorPrivReply 32
@@ -775,14 +775,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryExtensionsStringReply;
#define sz_xGLXQueryExtensionsStringReply 32
@@ -793,14 +793,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 pad3 B32; /* NOTE: may hold a single value */
- CARD32 pad4 B32; /* NOTE: may hold half a double */
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 pad3; /* NOTE: may hold a single value */
+ CARD32 pad4; /* NOTE: may hold half a double */
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryServerStringReply;
#define sz_xGLXQueryServerStringReply 32
@@ -812,14 +812,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numFBConfigs B32;
- CARD32 numAttribs B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numFBConfigs;
+ CARD32 numAttribs;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetFBConfigsReply;
#define sz_xGLXGetFBConfigsReply 32
@@ -829,14 +829,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 n B32; /* number of attribute/value pairs */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 n; /* number of attribute/value pairs */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryContextReply;
#define sz_xGLXQueryContextReply 32
@@ -846,14 +846,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- GLXContextTag contextTag B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ GLXContextTag contextTag;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXMakeContextCurrentReply;
#define sz_xGLXMakeContextCurrentReply 32
@@ -865,14 +865,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 success;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXCreateGLXPbufferReply;
#define sz_xGLXCreateGLXPbufferReply 32
@@ -882,14 +882,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numAttribs B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numAttribs;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetDrawableAttributesReply;
#define sz_xGLXGetDrawableAttributesReply 32
@@ -899,14 +899,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 width B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 width;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetColorTableReply;
#define sz_xGLXGetColorTableReply 32
@@ -920,10 +920,10 @@ typedef struct {
typedef struct GLXQueryContextInfoEXT {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- GLXContextID context B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ GLXContextID context;
} xGLXQueryContextInfoEXTReq;
#define sz_xGLXQueryContextInfoEXTReq 16
@@ -933,14 +933,14 @@ typedef struct GLXQueryContextInfoEXT {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 n B32; /* number of attribute/value pairs */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 n; /* number of attribute/value pairs */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryContextInfoEXTReply;
#define sz_xGLXQueryContextInfoEXTReply 32
@@ -950,26 +950,26 @@ typedef struct {
typedef struct GLXMakeCurrentReadSGI {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- GLXContextTag oldContextTag B32;
- GLXDrawable drawable B32;
- GLXDrawable readable B32;
- GLXContextID context B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ GLXContextTag oldContextTag;
+ GLXDrawable drawable;
+ GLXDrawable readable;
+ GLXContextID context;
} xGLXMakeCurrentReadSGIReq;
#define sz_xGLXMakeCurrentReadSGIReq 24
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- GLXContextTag contextTag B32;
- CARD32 writeVid B32;
- CARD32 writeType B32;
- CARD32 readVid B32;
- CARD32 readType B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ GLXContextTag contextTag;
+ CARD32 writeVid;
+ CARD32 writeType;
+ CARD32 readVid;
+ CARD32 readType;
+ CARD32 pad6;
} xGLXMakeCurrentReadSGIReply;
#define sz_xGLXMakeCurrentReadSGIReply 32
@@ -979,10 +979,10 @@ typedef struct {
typedef struct GLXGetFBConfigsSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
} xGLXGetFBConfigsSGIXReq;
#define sz_xGLXGetFBConfigsSGIXReq 16
@@ -993,17 +993,17 @@ typedef struct GLXGetFBConfigsSGIX {
typedef struct GLXCreateContextWithConfigSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- GLXContextID context B32;
- GLXFBConfigID fbconfig B32;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ GLXContextID context;
+ GLXFBConfigID fbconfig;
+ CARD32 screen;
CARD32 renderType;
- GLXContextID shareList B32;
+ GLXContextID shareList;
BOOL isDirect;
CARD8 reserved1;
- CARD16 reserved2 B16;
+ CARD16 reserved2;
} xGLXCreateContextWithConfigSGIXReq;
#define sz_xGLXCreateContextWithConfigSGIXReq 36
@@ -1014,13 +1014,13 @@ typedef struct GLXCreateContextWithConfigSGIX {
typedef struct GLXCreateGLXPixmapWithConfigSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
- GLXFBConfigID fbconfig B32;
- CARD32 pixmap B32;
- GLXPixmap glxpixmap B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
+ GLXFBConfigID fbconfig;
+ CARD32 pixmap;
+ GLXPixmap glxpixmap;
} xGLXCreateGLXPixmapWithConfigSGIXReq;
#define sz_xGLXCreateGLXPixmapWithConfigSGIXReq 28
@@ -1030,14 +1030,14 @@ typedef struct GLXCreateGLXPixmapWithConfigSGIX {
typedef struct GLXCreateGLXPbufferSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
- GLXFBConfigID fbconfig B32;
- GLXPbuffer pbuffer B32;
- CARD32 width B32;
- CARD32 height B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
+ GLXFBConfigID fbconfig;
+ GLXPbuffer pbuffer;
+ CARD32 width;
+ CARD32 height;
/* followed by attribute list */
} xGLXCreateGLXPbufferSGIXReq;
#define sz_xGLXCreateGLXPbufferSGIXReq 32
@@ -1048,10 +1048,10 @@ typedef struct GLXCreateGLXPbufferSGIX {
typedef struct GLXDestroyGLXPbuffer {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- GLXPbuffer pbuffer B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ GLXPbuffer pbuffer;
} xGLXDestroyGLXPbufferSGIXReq;
#define sz_xGLXDestroyGLXPbufferSGIXReq 16
@@ -1061,11 +1061,11 @@ typedef struct GLXDestroyGLXPbuffer {
typedef struct GLXChangeDrawableAttributesSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- GLXDrawable drawable B32;
- CARD32 numAttribs B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ GLXDrawable drawable;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXChangeDrawableAttributesSGIXReq;
#define sz_xGLXChangeDrawableAttributesSGIXReq 20
@@ -1076,10 +1076,10 @@ typedef struct GLXChangeDrawableAttributesSGIX {
typedef struct GLXGetDrawableAttributesSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- GLXDrawable drawable B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ GLXDrawable drawable;
} xGLXGetDrawableAttributesSGIXReq;
#define sz_xGLXGetDrawableAttributesSGIXReq 16
@@ -1089,14 +1089,14 @@ typedef struct GLXGetDrawableAttributesSGIX {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numAttribs B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numAttribs;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXGetDrawableAttributesSGIXReply;
#define sz_xGLXGetDrawableAttributesSGIXReply 32
@@ -1106,11 +1106,11 @@ typedef struct {
typedef struct GLXJoinSwapGroupSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 unused B32; /* corresponds to contextTag in hdr */
- GLXDrawable drawable B32;
- GLXDrawable member B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 unused; /* corresponds to contextTag in hdr */
+ GLXDrawable drawable;
+ GLXDrawable member;
} xGLXJoinSwapGroupSGIXReq;
#define sz_xGLXJoinSwapGroupSGIXReq 20
@@ -1120,11 +1120,11 @@ typedef struct GLXJoinSwapGroupSGIX {
typedef struct GLXBindSwapBarrierSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 unused B32; /* corresponds to contextTag in hdr */
- GLXDrawable drawable B32;
- CARD32 barrier B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 unused; /* corresponds to contextTag in hdr */
+ GLXDrawable drawable;
+ CARD32 barrier;
} xGLXBindSwapBarrierSGIXReq;
#define sz_xGLXBindSwapBarrierSGIXReq 20
@@ -1134,24 +1134,24 @@ typedef struct GLXBindSwapBarrierSGIX {
typedef struct GLXQueryMaxSwapBarriersSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 unused B32; /* corresponds to contextTag in hdr */
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 unused; /* corresponds to contextTag in hdr */
+ CARD32 screen;
} xGLXQueryMaxSwapBarriersSGIXReq;
#define sz_xGLXQueryMaxSwapBarriersSGIXReq 16
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 max B32;
- CARD32 size B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 max;
+ CARD32 size;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryMaxSwapBarriersSGIXReply;
#define sz_xGLXQueryMaxSwapBarriersSGIXReply 32
@@ -1161,10 +1161,10 @@ typedef struct {
typedef struct GLXQueryHyperpipeNetworkSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
} xGLXQueryHyperpipeNetworkSGIXReq;
#define sz_xGLXQueryHyperpipeNetworkSGIXReq 16
@@ -1174,14 +1174,14 @@ typedef struct GLXQueryHyperpipeNetworkSGIX {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 npipes B32; /* NOTE: may hold a single value */
- CARD32 pad4 B32; /* NOTE: may hold half a double */
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 npipes; /* NOTE: may hold a single value */
+ CARD32 pad4; /* NOTE: may hold half a double */
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryHyperpipeNetworkSGIXReply;
#define sz_xGLXQueryHyperpipeNetworkSGIXReply 32
@@ -1191,14 +1191,14 @@ typedef struct {
typedef struct GLXDestroyHyperpipeConfigSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
- CARD32 hpId B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
+ CARD32 hpId;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xGLXDestroyHyperpipeConfigSGIXReq;
#define sz_xGLXDestroyHyperpipeConfigSGIXReq 32
@@ -1208,14 +1208,14 @@ typedef struct GLXDestroyHyperpipeConfigSGIX {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 success B32; /* NOTE: may hold a single value */
- CARD32 pad4 B32; /* NOTE: may hold half a double */
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 success; /* NOTE: may hold a single value */
+ CARD32 pad4; /* NOTE: may hold half a double */
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXDestroyHyperpipeConfigSGIXReply;
#define sz_xGLXDestroyHyperpipeConfigSGIXReply 32
@@ -1225,14 +1225,14 @@ typedef struct {
typedef struct GLXQueryHyperpipeConfigSGIX {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
- CARD32 hpId B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
+ CARD32 hpId;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xGLXQueryHyperpipeConfigSGIXReq;
#define sz_xGLXQueryHyperpipeConfigSGIXReq 32
@@ -1242,14 +1242,14 @@ typedef struct GLXQueryHyperpipeConfigSGIX {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 npipes B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 npipes;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXQueryHyperpipeConfigSGIXReply;
#define sz_xGLXQueryHyperpipeConfigSGIXReply 32
@@ -1259,14 +1259,14 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 vendorCode B32; /* vendor-specific opcode */
- CARD32 pad1 B32; /* unused; corresponds to contextTag in header */
- CARD32 screen B32;
- CARD32 npipes B32;
- CARD32 networkId B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 length;
+ CARD32 vendorCode; /* vendor-specific opcode */
+ CARD32 pad1; /* unused; corresponds to contextTag in header */
+ CARD32 screen;
+ CARD32 npipes;
+ CARD32 networkId;
+ CARD32 pad2;
+ CARD32 pad3;
/* followed by attribute list */
} xGLXHyperpipeConfigSGIXReq;
#define sz_xGLXHyperpipeConfigSGIXReq 32
@@ -1277,14 +1277,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 n B32;
- CARD32 npipes B32;
- CARD32 hpId B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 n;
+ CARD32 npipes;
+ CARD32 hpId;
+ CARD32 pad5;
+ CARD32 pad6;
} xGLXHyperpipeConfigSGIXReply;
#define sz_xGLXHyperpipeConfigSGIXReply 32
@@ -1319,12 +1319,12 @@ typedef struct {
typedef struct GLXSetClientInfoARB {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 major B32;
- CARD32 minor B32;
- CARD32 numVersions B32;
- CARD32 numGLExtensionBytes B32;
- CARD32 numGLXExtensionBytes B32;
+ CARD16 length;
+ CARD32 major;
+ CARD32 minor;
+ CARD32 numVersions;
+ CARD32 numGLExtensionBytes;
+ CARD32 numGLXExtensionBytes;
/*
** More data may follow; this is just the header.
*/
@@ -1340,15 +1340,15 @@ typedef struct GLXSetClientInfoARB {
typedef struct GLXCreateContextAttribsARB {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- GLXContextID context B32;
- GLXFBConfigID fbconfig B32;
+ CARD16 length;
+ GLXContextID context;
+ GLXFBConfigID fbconfig;
CARD32 screen;
- GLXContextID shareList B32;
+ GLXContextID shareList;
BOOL isDirect;
CARD8 reserved1;
- CARD16 reserved2 B16;
- CARD32 numAttribs B32;
+ CARD16 reserved2;
+ CARD32 numAttribs;
/* followed by attribute list */
} xGLXCreateContextAttribsARBReq;
#define sz_xGLXCreateContextAttribsARBReq 28
@@ -1367,12 +1367,12 @@ typedef struct GLXCreateContextAttribsARB {
typedef struct GLXSetClientInfo2ARB {
CARD8 reqType;
CARD8 glxCode;
- CARD16 length B16;
- CARD32 major B32;
- CARD32 minor B32;
- CARD32 numVersions B32;
- CARD32 numGLExtensionBytes B32;
- CARD32 numGLXExtensionBytes B32;
+ CARD16 length;
+ CARD32 major;
+ CARD32 minor;
+ CARD32 numVersions;
+ CARD32 numGLExtensionBytes;
+ CARD32 numGLXExtensionBytes;
/*
** More data may follow; this is just the header.
*/
@@ -1389,46 +1389,46 @@ typedef struct GLXSetClientInfo2ARB {
typedef struct {
BYTE type;
BYTE pad;
- CARD16 sequenceNumber B16;
- CARD16 event_type B16; /*** was clobber_class */
- CARD16 draw_type B16;
- CARD32 drawable B32;
- CARD32 buffer_mask B32; /*** was mask */
- CARD16 aux_buffer B16;
- CARD16 x B16;
- CARD16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 count B16;
- CARD32 unused2 B32;
+ CARD16 sequenceNumber;
+ CARD16 event_type; /*** was clobber_class */
+ CARD16 draw_type;
+ CARD32 drawable;
+ CARD32 buffer_mask; /*** was mask */
+ CARD16 aux_buffer;
+ CARD16 x;
+ CARD16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD16 count;
+ CARD32 unused2;
} xGLXPbufferClobberEvent;
typedef struct {
BYTE type;
BYTE pad;
- CARD16 sequenceNumber B16;
- CARD16 event_type B16;
+ CARD16 sequenceNumber;
+ CARD16 event_type;
CARD32 drawable;
- CARD32 ust_hi B32;
- CARD32 ust_lo B32;
- CARD32 msc_hi B32;
- CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD32 ust_hi;
+ CARD32 ust_lo;
+ CARD32 msc_hi;
+ CARD32 msc_lo;
+ CARD32 sbc_hi;
+ CARD32 sbc_lo;
} xGLXBufferSwapComplete;
typedef struct {
BYTE type;
BYTE pad;
- CARD16 sequenceNumber B16;
- CARD16 event_type B16;
+ CARD16 sequenceNumber;
+ CARD16 event_type;
CARD16 pad2;
CARD32 drawable;
- CARD32 ust_hi B32;
- CARD32 ust_lo B32;
- CARD32 msc_hi B32;
- CARD32 msc_lo B32;
- CARD32 sbc B32;
+ CARD32 ust_hi;
+ CARD32 ust_lo;
+ CARD32 msc_hi;
+ CARD32 msc_lo;
+ CARD32 sbc;
} xGLXBufferSwapComplete2;
/************************************************************************/
@@ -1440,8 +1440,8 @@ typedef struct {
#define __GLX_VENDPRIV_HDR_SIZE sz_xGLXVendorPrivateReq
#define __GLX_RENDER_HDR \
- CARD16 length B16; \
- CARD16 opcode B16
+ CARD16 length; \
+ CARD16 opcode
#define __GLX_RENDER_HDR_SIZE 4
@@ -1450,8 +1450,8 @@ typedef struct {
} __GLXrenderHeader;
#define __GLX_RENDER_LARGE_HDR \
- CARD32 length B32; \
- CARD32 opcode B32
+ CARD32 length; \
+ CARD32 opcode
#define __GLX_RENDER_LARGE_HDR_SIZE 8
@@ -1470,10 +1470,10 @@ typedef struct {
BOOL lsbFirst; \
CARD8 reserved0; \
CARD8 reserved1; \
- CARD32 rowLength B32; \
- CARD32 skipRows B32; \
- CARD32 skipPixels B32; \
- CARD32 alignment B32
+ CARD32 rowLength; \
+ CARD32 skipRows; \
+ CARD32 skipPixels; \
+ CARD32 alignment
#define __GLX_PIXEL_HDR_SIZE 20
@@ -1491,14 +1491,14 @@ typedef struct {
BOOL lsbFirst; \
CARD8 reserved0; \
CARD8 reserved1; \
- CARD32 rowLength B32; \
- CARD32 imageHeight B32; \
- CARD32 imageDepth B32; \
- CARD32 skipRows B32; \
- CARD32 skipImages B32; \
- CARD32 skipVolumes B32; \
- CARD32 skipPixels B32; \
- CARD32 alignment B32
+ CARD32 rowLength; \
+ CARD32 imageHeight; \
+ CARD32 imageDepth; \
+ CARD32 skipRows; \
+ CARD32 skipImages; \
+ CARD32 skipVolumes; \
+ CARD32 skipPixels; \
+ CARD32 alignment
#define __GLX_PIXEL_3D_HDR_SIZE 36
@@ -1510,8 +1510,8 @@ typedef struct {
** Bitmap header
*/
#define __GLX_BITMAP_HDR \
- CARD32 width B32; \
- CARD32 height B32; \
+ CARD32 width; \
+ CARD32 height; \
FLOAT32 xorig F32; \
FLOAT32 yorig F32; \
FLOAT32 xmove F32; \
@@ -1559,14 +1559,14 @@ typedef struct {
** When a glTexImage1D call the height field is unexamined by the server.
*/
#define __GLX_TEXIMAGE_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 components B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 border B32; \
- CARD32 format B32; \
- CARD32 type B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 components; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 border; \
+ CARD32 format; \
+ CARD32 type
#define __GLX_TEXIMAGE_HDR_SIZE 32
@@ -1605,17 +1605,17 @@ typedef struct {
** future.
*/
#define __GLX_TEXIMAGE_3D_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 internalformat B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 depth B32; \
- CARD32 size4d B32; \
- CARD32 border B32; \
- CARD32 format B32; \
- CARD32 type B32; \
- CARD32 nullimage B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 internalformat; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 depth; \
+ CARD32 size4d; \
+ CARD32 border; \
+ CARD32 format; \
+ CARD32 type; \
+ CARD32 nullimage
#define __GLX_TEXIMAGE_3D_HDR_SIZE 44
@@ -1653,14 +1653,14 @@ typedef struct {
** are unexamined by the server and are considered to be padding.
*/
#define __GLX_TEXSUBIMAGE_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 xoffset B32; \
- CARD32 yoffset B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 format B32; \
- CARD32 type B32; \
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 xoffset; \
+ CARD32 yoffset; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 format; \
+ CARD32 type; \
CARD32 nullImage \
#define __GLX_TEXSUBIMAGE_HDR_SIZE 36
@@ -1698,19 +1698,19 @@ typedef struct {
** are unexamined by the server and are considered to be padding.
*/
#define __GLX_TEXSUBIMAGE_3D_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 xoffset B32; \
- CARD32 yoffset B32; \
- CARD32 zoffset B32; \
- CARD32 woffset B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 depth B32; \
- CARD32 size4d B32; \
- CARD32 format B32; \
- CARD32 type B32; \
- CARD32 nullImage \
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 xoffset; \
+ CARD32 yoffset; \
+ CARD32 zoffset; \
+ CARD32 woffset; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 depth; \
+ CARD32 size4d; \
+ CARD32 format; \
+ CARD32 type; \
+ CARD32 nullImage \
#define __GLX_TEXSUBIMAGE_3D_HDR_SIZE 52
@@ -1750,13 +1750,13 @@ typedef struct {
*/
#define __GLX_COMPRESSED_TEXIMAGE_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 internalFormat B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 border B32; \
- CARD32 imageSize B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 internalFormat; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 border; \
+ CARD32 imageSize
#define __GLX_COMPRESSED_TEXIMAGE_HDR_SIZE 28
@@ -1792,14 +1792,14 @@ typedef struct {
*/
#define __GLX_COMPRESSED_TEXSUBIMAGE_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 xoffset B32; \
- CARD32 yoffset B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 format B32; \
- CARD32 imageSize B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 xoffset; \
+ CARD32 yoffset; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 format; \
+ CARD32 imageSize
#define __GLX_COMPRESSED_TEXSUBIMAGE_HDR_SIZE 32
@@ -1831,14 +1831,14 @@ typedef struct {
*/
#define __GLX_COMPRESSED_TEXIMAGE_3D_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 internalFormat B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 depth B32; \
- CARD32 border B32; \
- CARD32 imageSize B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 internalFormat; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 depth; \
+ CARD32 border; \
+ CARD32 imageSize
#define __GLX_COMPRESSED_TEXIMAGE_3D_HDR_SIZE 32
@@ -1870,16 +1870,16 @@ typedef struct {
*/
#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR \
- CARD32 target B32; \
- CARD32 level B32; \
- CARD32 xoffset B32; \
- CARD32 yoffset B32; \
- CARD32 zoffset B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 depth B32; \
- CARD32 format B32; \
- CARD32 imageSize B32
+ CARD32 target; \
+ CARD32 level; \
+ CARD32 xoffset; \
+ CARD32 yoffset; \
+ CARD32 zoffset; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 depth; \
+ CARD32 format; \
+ CARD32 imageSize
#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR_SIZE 32
@@ -1911,10 +1911,10 @@ typedef struct {
** DrawPixels header
*/
#define __GLX_DRAWPIXELS_HDR \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 format B32; \
- CARD32 type B32
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 format; \
+ CARD32 type
#define __GLX_DRAWPIXELS_HDR_SIZE 16
@@ -1950,12 +1950,12 @@ typedef struct {
** When a glConvolutionFilter1D call the height field is unexamined by the server.
*/
#define __GLX_CONV_FILT_HDR \
- CARD32 target B32; \
- CARD32 internalformat B32; \
- CARD32 width B32; \
- CARD32 height B32; \
- CARD32 format B32; \
- CARD32 type B32
+ CARD32 target; \
+ CARD32 internalformat; \
+ CARD32 width; \
+ CARD32 height; \
+ CARD32 format; \
+ CARD32 type
#define __GLX_CONV_FILT_HDR_SIZE 24
@@ -1991,9 +1991,9 @@ typedef struct {
*/
#define __GLX_DRAWARRAYS_HDR \
- CARD32 numVertexes B32; \
- CARD32 numComponents B32; \
- CARD32 primType B32
+ CARD32 numVertexes; \
+ CARD32 numComponents; \
+ CARD32 primType
#define __GLX_DRAWARRAYS_HDR_SIZE 12
@@ -2015,9 +2015,9 @@ typedef struct {
} __GLXdispatchDrawArraysHeader;
#define __GLX_COMPONENT_HDR \
- CARD32 datatype B32; \
- INT32 numVals B32; \
- CARD32 component B32
+ CARD32 datatype; \
+ INT32 numVals; \
+ CARD32 component
typedef struct {
__GLX_COMPONENT_HDR;
@@ -2034,11 +2034,11 @@ typedef struct {
*/
#define __GLX_COLOR_TABLE_HDR \
- CARD32 target B32; \
- CARD32 internalformat B32; \
- CARD32 width B32; \
- CARD32 format B32; \
- CARD32 type B32
+ CARD32 target; \
+ CARD32 internalformat; \
+ CARD32 width; \
+ CARD32 format; \
+ CARD32 type
#define __GLX_COLOR_TABLE_HDR_SIZE 20
@@ -2071,11 +2071,11 @@ typedef struct {
*/
#define __GLX_COLOR_SUBTABLE_HDR \
- CARD32 target B32; \
- CARD32 start B32; \
- CARD32 count B32; \
- CARD32 format B32; \
- CARD32 type B32
+ CARD32 target; \
+ CARD32 start; \
+ CARD32 count; \
+ CARD32 format; \
+ CARD32 type
#define __GLX_COLOR_SUBTABLE_HDR_SIZE 20
diff --git a/include/X11/PM/PMproto.h b/include/X11/PM/PMproto.h
index 754e460..1395905 100644
--- a/include/X11/PM/PMproto.h
+++ b/include/X11/PM/PMproto.h
@@ -34,8 +34,8 @@ from The Open Group.
typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode; /* == 1 */
- CARD16 authLen B16;
- CARD32 length B32;
+ CARD16 authLen;
+ CARD32 length;
/* STRING proxy-service */
/* STRING server-address */
/* STRING host-address */
@@ -52,7 +52,7 @@ typedef struct {
CARD8 minorOpcode; /* == 2 */
CARD8 status;
CARD8 unused;
- CARD32 length B32;
+ CARD32 length;
/* STRING proxy-address */
/* STRING failure-reason */
} pmGetProxyAddrReplyMsg;
@@ -63,8 +63,8 @@ typedef struct {
typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode; /* == 3 */
- CARD16 unused B16;
- CARD32 length B32;
+ CARD16 unused;
+ CARD32 length;
/* STRING proxy-service */
} pmStartProxyMsg;
diff --git a/include/X11/XWDFile.h b/include/X11/XWDFile.h
index 1e53749..3d0ab89 100644
--- a/include/X11/XWDFile.h
+++ b/include/X11/XWDFile.h
@@ -51,44 +51,44 @@ typedef CARD32 xwdval; /* for old broken programs */
typedef struct _xwd_file_header {
/* header_size = SIZEOF(XWDheader) + length of null-terminated
* window name. */
- CARD32 header_size B32;
+ CARD32 header_size;
- CARD32 file_version B32; /* = XWD_FILE_VERSION above */
- CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */
- CARD32 pixmap_depth B32; /* Pixmap depth */
- CARD32 pixmap_width B32; /* Pixmap width */
- CARD32 pixmap_height B32; /* Pixmap height */
- CARD32 xoffset B32; /* Bitmap x offset, normally 0 */
- CARD32 byte_order B32; /* of image data: MSBFirst, LSBFirst */
+ CARD32 file_version; /* = XWD_FILE_VERSION above */
+ CARD32 pixmap_format; /* ZPixmap or XYPixmap */
+ CARD32 pixmap_depth; /* Pixmap depth */
+ CARD32 pixmap_width; /* Pixmap width */
+ CARD32 pixmap_height; /* Pixmap height */
+ CARD32 xoffset; /* Bitmap x offset, normally 0 */
+ CARD32 byte_order; /* of image data: MSBFirst, LSBFirst */
/* bitmap_unit applies to bitmaps (depth 1 format XY) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_unit B32;
+ CARD32 bitmap_unit;
- CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */
+ CARD32 bitmap_bit_order; /* bitmaps only: MSBFirst, LSBFirst */
/* bitmap_pad applies to pixmaps (non-bitmaps) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_pad B32;
+ CARD32 bitmap_pad;
- CARD32 bits_per_pixel B32; /* Bits per pixel */
+ CARD32 bits_per_pixel; /* Bits per pixel */
/* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps)
* or bitmap_pad (pixmaps). It is the delta (in bytes) to get
* to the same x position on an adjacent row. */
- CARD32 bytes_per_line B32;
- CARD32 visual_class B32; /* Class of colormap */
- CARD32 red_mask B32; /* Z red mask */
- CARD32 green_mask B32; /* Z green mask */
- CARD32 blue_mask B32; /* Z blue mask */
- CARD32 bits_per_rgb B32; /* Log2 of distinct color values */
- CARD32 colormap_entries B32; /* Number of entries in colormap; not used? */
- CARD32 ncolors B32; /* Number of XWDColor structures */
- CARD32 window_width B32; /* Window width */
- CARD32 window_height B32; /* Window height */
- CARD32 window_x B32; /* Window upper left X coordinate */
- CARD32 window_y B32; /* Window upper left Y coordinate */
- CARD32 window_bdrwidth B32; /* Window border width */
+ CARD32 bytes_per_line;
+ CARD32 visual_class; /* Class of colormap */
+ CARD32 red_mask; /* Z red mask */
+ CARD32 green_mask; /* Z green mask */
+ CARD32 blue_mask; /* Z blue mask */
+ CARD32 bits_per_rgb; /* Log2 of distinct color values */
+ CARD32 colormap_entries; /* Number of entries in colormap; not used? */
+ CARD32 ncolors; /* Number of XWDColor structures */
+ CARD32 window_width; /* Window width */
+ CARD32 window_height; /* Window height */
+ CARD32 window_x; /* Window upper left X coordinate */
+ CARD32 window_y; /* Window upper left Y coordinate */
+ CARD32 window_bdrwidth; /* Window border width */
} XWDFileHeader;
/* Null-terminated window name follows the above structure. */
@@ -99,10 +99,10 @@ typedef struct _xwd_file_header {
*/
typedef struct {
- CARD32 pixel B32;
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
+ CARD32 pixel;
+ CARD16 red;
+ CARD16 green;
+ CARD16 blue;
CARD8 flags;
CARD8 pad;
} XWDColor;
diff --git a/include/X11/Xproto.h b/include/X11/Xproto.h
index 640288d..74193e2 100644
--- a/include/X11/Xproto.h
+++ b/include/X11/Xproto.h
@@ -269,10 +269,10 @@ typedef CARD16 KeyButMask;
typedef struct {
CARD8 byteOrder;
BYTE pad;
- CARD16 majorVersion B16, minorVersion B16;
- CARD16 nbytesAuthProto B16; /* Authorization protocol */
- CARD16 nbytesAuthString B16; /* Authorization string */
- CARD16 pad2 B16;
+ CARD16 majorVersion, minorVersion;
+ CARD16 nbytesAuthProto; /* Authorization protocol */
+ CARD16 nbytesAuthString; /* Authorization string */
+ CARD16 pad2;
} xConnClientPrefix;
/* Server response to xConnClientPrefix.
@@ -288,19 +288,19 @@ typedef struct {
typedef struct {
CARD8 success;
BYTE lengthReason; /*num bytes in string following if failure */
- CARD16 majorVersion B16,
- minorVersion B16;
- CARD16 length B16; /* 1/4 additional bytes in setup info */
+ CARD16 majorVersion,
+ minorVersion;
+ CARD16 length; /* 1/4 additional bytes in setup info */
} xConnSetupPrefix;
typedef struct {
- CARD32 release B32;
- CARD32 ridBase B32,
- ridMask B32;
- CARD32 motionBufferSize B32;
- CARD16 nbytesVendor B16; /* number of bytes in vendor string */
- CARD16 maxRequestSize B16;
+ CARD32 release;
+ CARD32 ridBase,
+ ridMask;
+ CARD32 motionBufferSize;
+ CARD16 nbytesVendor; /* number of bytes in vendor string */
+ CARD16 maxRequestSize;
CARD8 numRoots; /* number of roots structs to follow */
CARD8 numFormats; /* number of pixmap formats */
CARD8 imageByteOrder; /* LSBFirst, MSBFirst */
@@ -308,7 +308,7 @@ typedef struct {
CARD8 bitmapScanlineUnit, /* 8, 16, 32 */
bitmapScanlinePad; /* 8, 16, 32 */
KeyCode minKeyCode, maxKeyCode;
- CARD32 pad2 B32;
+ CARD32 pad2;
} xConnSetup;
typedef struct {
@@ -316,7 +316,7 @@ typedef struct {
CARD8 bitsPerPixel;
CARD8 scanLinePad;
CARD8 pad1;
- CARD32 pad2 B32;
+ CARD32 pad2;
} xPixmapFormat;
/* window root */
@@ -324,32 +324,32 @@ typedef struct {
typedef struct {
CARD8 depth;
CARD8 pad1;
- CARD16 nVisuals B16; /* number of xVisualType structures following */
- CARD32 pad2 B32;
+ CARD16 nVisuals; /* number of xVisualType structures following */
+ CARD32 pad2;
} xDepth;
typedef struct {
- VisualID visualID B32;
+ VisualID visualID;
#if defined(__cplusplus) || defined(c_plusplus)
CARD8 c_class;
#else
CARD8 class;
#endif
CARD8 bitsPerRGB;
- CARD16 colormapEntries B16;
- CARD32 redMask B32, greenMask B32, blueMask B32;
- CARD32 pad B32;
+ CARD16 colormapEntries;
+ CARD32 redMask, greenMask, blueMask;
+ CARD32 pad;
} xVisualType;
typedef struct {
- Window windowId B32;
- Colormap defaultColormap B32;
- CARD32 whitePixel B32, blackPixel B32;
- CARD32 currentInputMask B32;
- CARD16 pixWidth B16, pixHeight B16;
- CARD16 mmWidth B16, mmHeight B16;
- CARD16 minInstalledMaps B16, maxInstalledMaps B16;
- VisualID rootVisualID B32;
+ Window windowId;
+ Colormap defaultColormap;
+ CARD32 whitePixel, blackPixel;
+ CARD32 currentInputMask;
+ CARD16 pixWidth, pixHeight;
+ CARD16 mmWidth, mmHeight;
+ CARD16 minInstalledMaps, maxInstalledMaps;
+ VisualID rootVisualID;
CARD8 backingStore;
BOOL saveUnders;
CARD8 rootDepth;
@@ -365,28 +365,28 @@ typedef struct {
/* Used in GetMotionEvents */
typedef struct {
- CARD32 time B32;
- INT16 x B16, y B16;
+ CARD32 time;
+ INT16 x, y;
} xTimecoord;
typedef struct {
CARD8 family;
BYTE pad;
- CARD16 length B16;
+ CARD16 length;
} xHostEntry;
typedef struct {
- INT16 leftSideBearing B16,
- rightSideBearing B16,
- characterWidth B16,
- ascent B16,
- descent B16;
- CARD16 attributes B16;
+ INT16 leftSideBearing,
+ rightSideBearing,
+ characterWidth,
+ ascent,
+ descent;
+ CARD16 attributes;
} xCharInfo;
typedef struct {
- Atom name B32;
- CARD32 value B32;
+ Atom name;
+ CARD32 value;
} xFontProp;
/*
@@ -400,15 +400,15 @@ typedef struct { /* followed by string */
typedef struct {
- CARD32 pixel B32;
- CARD16 red B16, green B16, blue B16;
+ CARD32 pixel;
+ CARD16 red, green, blue;
CARD8 flags; /* DoRed, DoGreen, DoBlue booleans */
CARD8 pad;
} xColorItem;
typedef struct {
- CARD16 red B16, green B16, blue B16, pad B16;
+ CARD16 red, green, blue, pad;
} xrgb;
typedef CARD8 KEYCODE;
@@ -425,14 +425,14 @@ typedef CARD8 KEYCODE;
typedef struct {
BYTE type; /* X_Reply */
BYTE data1; /* depends on reply type */
- CARD16 sequenceNumber B16; /* of last request received by server */
- CARD32 length B32; /* 4 byte quantities beyond size of GenericReply */
- CARD32 data00 B32;
- CARD32 data01 B32;
- CARD32 data02 B32;
- CARD32 data03 B32;
- CARD32 data04 B32;
- CARD32 data05 B32;
+ CARD16 sequenceNumber; /* of last request received by server */
+ CARD32 length; /* 4 byte quantities beyond size of GenericReply */
+ CARD32 data00;
+ CARD32 data01;
+ CARD32 data02;
+ CARD32 data03;
+ CARD32 data04;
+ CARD32 data05;
} xGenericReply;
/* Individual reply formats. */
@@ -440,134 +440,134 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 backingStore;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* NOT 0; this is an extra-large reply */
- VisualID visualID B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* NOT 0; this is an extra-large reply */
+ VisualID visualID;
#if defined(__cplusplus) || defined(c_plusplus)
- CARD16 c_class B16;
+ CARD16 c_class;
#else
- CARD16 class B16;
+ CARD16 class;
#endif
CARD8 bitGravity;
CARD8 winGravity;
- CARD32 backingBitPlanes B32;
- CARD32 backingPixel B32;
+ CARD32 backingBitPlanes;
+ CARD32 backingPixel;
BOOL saveUnder;
BOOL mapInstalled;
CARD8 mapState;
BOOL override;
- Colormap colormap B32;
- CARD32 allEventMasks B32;
- CARD32 yourEventMask B32;
- CARD16 doNotPropagateMask B16;
- CARD16 pad B16;
+ Colormap colormap;
+ CARD32 allEventMasks;
+ CARD32 yourEventMask;
+ CARD16 doNotPropagateMask;
+ CARD16 pad;
} xGetWindowAttributesReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 depth;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Window root B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD16 borderWidth B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Window root;
+ INT16 x, y;
+ CARD16 width, height;
+ CARD16 borderWidth;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xGetGeometryReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Window root B32, parent B32;
- CARD16 nChildren B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Window root, parent;
+ CARD16 nChildren;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xQueryTreeReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Atom atom B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Atom atom;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xInternAtomReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* of additional bytes */
- CARD16 nameLength B16; /* # of characters in name */
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* of additional bytes */
+ CARD16 nameLength; /* # of characters in name */
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGetAtomNameReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 format;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* of additional bytes */
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32; /* # of 8, 16, or 32-bit entities in reply */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* of additional bytes */
+ Atom propertyType;
+ CARD32 bytesAfter;
+ CARD32 nItems; /* # of 8, 16, or 32-bit entities in reply */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xGetPropertyReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nProperties B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nProperties;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xListPropertiesReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Window owner B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Window owner;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetSelectionOwnerReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE status;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGrabPointerReply;
typedef xGrabPointerReply xGrabKeyboardReply;
@@ -575,59 +575,59 @@ typedef xGrabPointerReply xGrabKeyboardReply;
typedef struct {
BYTE type; /* X_Reply */
BOOL sameScreen;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Window root B32, child B32;
- INT16 rootX B16, rootY B16, winX B16, winY B16;
- CARD16 mask B16;
- CARD16 pad1 B16;
- CARD32 pad B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Window root, child;
+ INT16 rootX, rootY, winX, winY;
+ CARD16 mask;
+ CARD16 pad1;
+ CARD32 pad;
} xQueryPointerReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 nEvents B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 nEvents;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetMotionEventsReply;
typedef struct {
BYTE type; /* X_Reply */
BOOL sameScreen;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Window child B32;
- INT16 dstX B16, dstY B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Window child;
+ INT16 dstX, dstY;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xTranslateCoordsReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 revertTo;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- Window focus B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ Window focus;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xGetInputFocusReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 2, NOT 0; this is an extra-large reply */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 2, NOT 0; this is an extra-large reply */
BYTE map[32];
} xQueryKeymapReply;
@@ -635,238 +635,238 @@ typedef struct {
typedef struct _xQueryFontReply {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* definitely > 0, even if "nCharInfos" is 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* definitely > 0, even if "nCharInfos" is 0 */
xCharInfo minBounds;
- CARD32 walign1 B32;
+ CARD32 walign1;
xCharInfo maxBounds;
- CARD32 walign2 B32;
- CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
- CARD16 defaultChar B16;
- CARD16 nFontProps B16; /* followed by this many xFontProp structures */
+ CARD32 walign2;
+ CARD16 minCharOrByte2, maxCharOrByte2;
+ CARD16 defaultChar;
+ CARD16 nFontProps; /* followed by this many xFontProp structures */
CARD8 drawDirection;
CARD8 minByte1, maxByte1;
BOOL allCharsExist;
- INT16 fontAscent B16, fontDescent B16;
- CARD32 nCharInfos B32; /* followed by this many xCharInfo structures */
+ INT16 fontAscent, fontDescent;
+ CARD32 nCharInfos; /* followed by this many xCharInfo structures */
} xQueryFontReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 drawDirection;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- INT16 fontAscent B16, fontDescent B16;
- INT16 overallAscent B16, overallDescent B16;
- INT32 overallWidth B32, overallLeft B32, overallRight B32;
- CARD32 pad B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ INT16 fontAscent, fontDescent;
+ INT16 overallAscent, overallDescent;
+ INT32 overallWidth, overallLeft, overallRight;
+ CARD32 pad;
} xQueryTextExtentsReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nFonts B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nFonts;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xListFontsReply;
/* Warning: this MUST match (up to component renaming) xQueryFontReply */
typedef struct {
BYTE type; /* X_Reply */
CARD8 nameLength; /* 0 indicates end-of-reply-sequence */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* definitely > 0, even if "nameLength" is 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* definitely > 0, even if "nameLength" is 0 */
xCharInfo minBounds;
- CARD32 walign1 B32;
+ CARD32 walign1;
xCharInfo maxBounds;
- CARD32 walign2 B32;
- CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
- CARD16 defaultChar B16;
- CARD16 nFontProps B16; /* followed by this many xFontProp structures */
+ CARD32 walign2;
+ CARD16 minCharOrByte2, maxCharOrByte2;
+ CARD16 defaultChar;
+ CARD16 nFontProps; /* followed by this many xFontProp structures */
CARD8 drawDirection;
CARD8 minByte1, maxByte1;
BOOL allCharsExist;
- INT16 fontAscent B16, fontDescent B16;
- CARD32 nReplies B32; /* hint as to how many more replies might be coming */
+ INT16 fontAscent, fontDescent;
+ CARD32 nReplies; /* hint as to how many more replies might be coming */
} xListFontsWithInfoReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nPaths B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nPaths;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGetFontPathReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 depth;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- VisualID visual B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ VisualID visual;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGetImageReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nColormaps B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nColormaps;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xListInstalledColormapsReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 red B16, green B16, blue B16;
- CARD16 pad2 B16;
- CARD32 pixel B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 red, green, blue;
+ CARD16 pad2;
+ CARD32 pixel;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xAllocColorReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD32 pixel B32;
- CARD16 exactRed B16, exactGreen B16, exactBlue B16;
- CARD16 screenRed B16, screenGreen B16, screenBlue B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD32 pixel;
+ CARD16 exactRed, exactGreen, exactBlue;
+ CARD16 screenRed, screenGreen, screenBlue;
+ CARD32 pad2;
+ CARD32 pad3;
} xAllocNamedColorReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nPixels B16, nMasks B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nPixels, nMasks;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xAllocColorCellsReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nPixels B16;
- CARD16 pad2 B16;
- CARD32 redMask B32, greenMask B32, blueMask B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nPixels;
+ CARD16 pad2;
+ CARD32 redMask, greenMask, blueMask;
+ CARD32 pad3;
+ CARD32 pad4;
} xAllocColorPlanesReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nColors B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nColors;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xQueryColorsReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 exactRed B16, exactGreen B16, exactBlue B16;
- CARD16 screenRed B16, screenGreen B16, screenBlue B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 exactRed, exactGreen, exactBlue;
+ CARD16 screenRed, screenGreen, screenBlue;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLookupColorReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 width B16, height B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 width, height;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xQueryBestSizeReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
BOOL present;
CARD8 major_opcode;
CARD8 first_event;
CARD8 first_error;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xQueryExtensionReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 nExtensions;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xListExtensionsReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 success;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xSetMappingReply;
typedef xSetMappingReply xSetPointerMappingReply;
typedef xSetMappingReply xSetModifierMappingReply;
@@ -874,95 +874,95 @@ typedef xSetMappingReply xSetModifierMappingReply;
typedef struct {
BYTE type; /* X_Reply */
CARD8 nElts; /* how many elements does the map have */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGetPointerMappingReply;
typedef struct {
BYTE type;
CARD8 keySymsPerKeyCode;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGetKeyboardMappingReply;
typedef struct {
BYTE type;
CARD8 numKeyPerModifier;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetModifierMappingReply;
typedef struct {
BYTE type; /* X_Reply */
BOOL globalAutoRepeat;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 5 */
- CARD32 ledMask B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 5 */
+ CARD32 ledMask;
CARD8 keyClickPercent, bellPercent;
- CARD16 bellPitch B16, bellDuration B16;
- CARD16 pad B16;
+ CARD16 bellPitch, bellDuration;
+ CARD16 pad;
BYTE map[32]; /* bit masks start here */
} xGetKeyboardControlReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 accelNumerator B16, accelDenominator B16;
- CARD16 threshold B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 accelNumerator, accelDenominator;
+ CARD16 threshold;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetPointerControlReply;
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 timeout B16, interval B16;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 timeout, interval;
BOOL preferBlanking;
BOOL allowExposures;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xGetScreenSaverReply;
typedef struct {
BYTE type; /* X_Reply */
BOOL enabled;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nHosts B16;
- CARD16 pad1 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nHosts;
+ CARD16 pad1;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xListHostsReply;
@@ -976,16 +976,16 @@ typedef struct {
typedef struct {
BYTE type; /* X_Error */
BYTE errorCode;
- CARD16 sequenceNumber B16; /* the nth request from this client */
- CARD32 resourceID B32;
- CARD16 minorCode B16;
+ CARD16 sequenceNumber; /* the nth request from this client */
+ CARD32 resourceID;
+ CARD16 minorCode;
CARD8 majorCode;
BYTE pad1;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xError;
/*****************************************************************
@@ -998,68 +998,68 @@ typedef struct _xEvent {
struct {
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
} u;
struct {
- CARD32 pad00 B32;
- Time time B32;
- Window root B32, event B32, child B32;
- INT16 rootX B16, rootY B16, eventX B16, eventY B16;
- KeyButMask state B16;
+ CARD32 pad00;
+ Time time;
+ Window root, event, child;
+ INT16 rootX, rootY, eventX, eventY;
+ KeyButMask state;
BOOL sameScreen;
BYTE pad1;
} keyButtonPointer;
struct {
- CARD32 pad00 B32;
- Time time B32;
- Window root B32, event B32, child B32;
- INT16 rootX B16, rootY B16, eventX B16, eventY B16;
- KeyButMask state B16;
+ CARD32 pad00;
+ Time time;
+ Window root, event, child;
+ INT16 rootX, rootY, eventX, eventY;
+ KeyButMask state;
BYTE mode; /* really XMode */
BYTE flags; /* sameScreen and focus booleans, packed together */
#define ELFlagFocus (1<<0)
#define ELFlagSameScreen (1<<1)
} enterLeave;
struct {
- CARD32 pad00 B32;
- Window window B32;
+ CARD32 pad00;
+ Window window;
BYTE mode; /* really XMode */
BYTE pad1, pad2, pad3;
} focus;
struct {
- CARD32 pad00 B32;
- Window window B32;
- CARD16 x B16, y B16, width B16, height B16;
- CARD16 count B16;
- CARD16 pad2 B16;
+ CARD32 pad00;
+ Window window;
+ CARD16 x, y, width, height;
+ CARD16 count;
+ CARD16 pad2;
} expose;
struct {
- CARD32 pad00 B32;
- Drawable drawable B32;
- CARD16 x B16, y B16, width B16, height B16;
- CARD16 minorEvent B16;
- CARD16 count B16;
+ CARD32 pad00;
+ Drawable drawable;
+ CARD16 x, y, width, height;
+ CARD16 minorEvent;
+ CARD16 count;
BYTE majorEvent;
BYTE pad1, pad2, pad3;
} graphicsExposure;
struct {
- CARD32 pad00 B32;
- Drawable drawable B32;
- CARD16 minorEvent B16;
+ CARD32 pad00;
+ Drawable drawable;
+ CARD16 minorEvent;
BYTE majorEvent;
BYTE bpad;
} noExposure;
struct {
- CARD32 pad00 B32;
- Window window B32;
+ CARD32 pad00;
+ Window window;
CARD8 state;
BYTE pad1, pad2, pad3;
} visibility;
struct {
- CARD32 pad00 B32;
- Window parent B32, window B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
+ CARD32 pad00;
+ Window parent, window;
+ INT16 x, y;
+ CARD16 width, height, borderWidth;
BOOL override;
BYTE bpad;
} createNotify;
@@ -1072,98 +1072,98 @@ typedef struct _xEvent {
* the same offset for the event window.
*/
struct {
- CARD32 pad00 B32;
- Window event B32, window B32;
+ CARD32 pad00;
+ Window event, window;
} destroyNotify;
struct {
- CARD32 pad00 B32;
- Window event B32, window B32;
+ CARD32 pad00;
+ Window event, window;
BOOL fromConfigure;
BYTE pad1, pad2, pad3;
} unmapNotify;
struct {
- CARD32 pad00 B32;
- Window event B32, window B32;
+ CARD32 pad00;
+ Window event, window;
BOOL override;
BYTE pad1, pad2, pad3;
} mapNotify;
struct {
- CARD32 pad00 B32;
- Window parent B32, window B32;
+ CARD32 pad00;
+ Window parent, window;
} mapRequest;
struct {
- CARD32 pad00 B32;
- Window event B32, window B32, parent B32;
- INT16 x B16, y B16;
+ CARD32 pad00;
+ Window event, window, parent;
+ INT16 x, y;
BOOL override;
BYTE pad1, pad2, pad3;
} reparent;
struct {
- CARD32 pad00 B32;
- Window event B32, window B32, aboveSibling B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
+ CARD32 pad00;
+ Window event, window, aboveSibling;
+ INT16 x, y;
+ CARD16 width, height, borderWidth;
BOOL override;
BYTE bpad;
} configureNotify;
struct {
- CARD32 pad00 B32;
- Window parent B32, window B32, sibling B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
- CARD16 valueMask B16;
- CARD32 pad1 B32;
+ CARD32 pad00;
+ Window parent, window, sibling;
+ INT16 x, y;
+ CARD16 width, height, borderWidth;
+ CARD16 valueMask;
+ CARD32 pad1;
} configureRequest;
struct {
- CARD32 pad00 B32;
- Window event B32, window B32;
- INT16 x B16, y B16;
- CARD32 pad1 B32, pad2 B32, pad3 B32, pad4 B32;
+ CARD32 pad00;
+ Window event, window;
+ INT16 x, y;
+ CARD32 pad1, pad2, pad3, pad4;
} gravity;
struct {
- CARD32 pad00 B32;
- Window window B32;
- CARD16 width B16, height B16;
+ CARD32 pad00;
+ Window window;
+ CARD16 width, height;
} resizeRequest;
struct {
/* The event field in the circulate record is really the parent when this
is used as a CirculateRequest instead of a CirculateNotify */
- CARD32 pad00 B32;
- Window event B32, window B32, parent B32;
+ CARD32 pad00;
+ Window event, window, parent;
BYTE place; /* Top or Bottom */
BYTE pad1, pad2, pad3;
} circulate;
struct {
- CARD32 pad00 B32;
- Window window B32;
- Atom atom B32;
- Time time B32;
+ CARD32 pad00;
+ Window window;
+ Atom atom;
+ Time time;
BYTE state; /* NewValue or Deleted */
BYTE pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} property;
struct {
- CARD32 pad00 B32;
- Time time B32;
- Window window B32;
- Atom atom B32;
+ CARD32 pad00;
+ Time time;
+ Window window;
+ Atom atom;
} selectionClear;
struct {
- CARD32 pad00 B32;
- Time time B32;
- Window owner B32, requestor B32;
- Atom selection B32, target B32, property B32;
+ CARD32 pad00;
+ Time time;
+ Window owner, requestor;
+ Atom selection, target, property;
} selectionRequest;
struct {
- CARD32 pad00 B32;
- Time time B32;
- Window requestor B32;
- Atom selection B32, target B32, property B32;
+ CARD32 pad00;
+ Time time;
+ Window requestor;
+ Atom selection, target, property;
} selectionNotify;
struct {
- CARD32 pad00 B32;
- Window window B32;
- Colormap colormap B32;
+ CARD32 pad00;
+ Window window;
+ Colormap colormap;
#if defined(__cplusplus) || defined(c_plusplus)
BOOL c_new;
#else
@@ -1173,39 +1173,39 @@ typedef struct _xEvent {
BYTE pad1, pad2;
} colormap;
struct {
- CARD32 pad00 B32;
+ CARD32 pad00;
CARD8 request;
KeyCode firstKeyCode;
CARD8 count;
BYTE pad1;
} mappingNotify;
struct {
- CARD32 pad00 B32;
- Window window B32;
+ CARD32 pad00;
+ Window window;
union {
struct {
- Atom type B32;
- INT32 longs0 B32;
- INT32 longs1 B32;
- INT32 longs2 B32;
- INT32 longs3 B32;
- INT32 longs4 B32;
+ Atom type;
+ INT32 longs0;
+ INT32 longs1;
+ INT32 longs2;
+ INT32 longs3;
+ INT32 longs4;
} l;
struct {
- Atom type B32;
- INT16 shorts0 B16;
- INT16 shorts1 B16;
- INT16 shorts2 B16;
- INT16 shorts3 B16;
- INT16 shorts4 B16;
- INT16 shorts5 B16;
- INT16 shorts6 B16;
- INT16 shorts7 B16;
- INT16 shorts8 B16;
- INT16 shorts9 B16;
+ Atom type;
+ INT16 shorts0;
+ INT16 shorts1;
+ INT16 shorts2;
+ INT16 shorts3;
+ INT16 shorts4;
+ INT16 shorts5;
+ INT16 shorts6;
+ INT16 shorts7;
+ INT16 shorts8;
+ INT16 shorts9;
} s;
struct {
- Atom type B32;
+ Atom type;
INT8 bytes[20];
} b;
} u;
@@ -1232,15 +1232,15 @@ typedef struct
{
BYTE type;
CARD8 extension;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 evtype B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 evtype;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xGenericEvent;
@@ -1314,7 +1314,7 @@ typedef union {
typedef struct _xReq {
CARD8 reqType;
CARD8 data; /* meaning depends on request type */
- CARD16 length B16; /* length in 4 bytes quantities
+ CARD16 length; /* length in 4 bytes quantities
of whole request, including this header */
} xReq;
@@ -1328,90 +1328,90 @@ typedef struct _xReq {
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD32 id B32; /* a Window, Drawable, Font, GContext, Pixmap, etc. */
+ CARD16 length;
+ CARD32 id; /* a Window, Drawable, Font, GContext, Pixmap, etc. */
} xResourceReq;
typedef struct {
CARD8 reqType;
CARD8 depth;
- CARD16 length B16;
- Window wid B32, parent B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
+ CARD16 length;
+ Window wid, parent;
+ INT16 x, y;
+ CARD16 width, height, borderWidth;
#if defined(__cplusplus) || defined(c_plusplus)
- CARD16 c_class B16;
+ CARD16 c_class;
#else
- CARD16 class B16;
+ CARD16 class;
#endif
- VisualID visual B32;
- CARD32 mask B32;
+ VisualID visual;
+ CARD32 mask;
} xCreateWindowReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32;
- CARD32 valueMask B32;
+ CARD16 length;
+ Window window;
+ CARD32 valueMask;
} xChangeWindowAttributesReq;
typedef struct {
CARD8 reqType;
BYTE mode;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xChangeSaveSetReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32, parent B32;
- INT16 x B16, y B16;
+ CARD16 length;
+ Window window, parent;
+ INT16 x, y;
} xReparentWindowReq;
typedef struct {
CARD8 reqType;
CARD8 pad;
- CARD16 length B16;
- Window window B32;
- CARD16 mask B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ Window window;
+ CARD16 mask;
+ CARD16 pad2;
} xConfigureWindowReq;
typedef struct {
CARD8 reqType;
CARD8 direction;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xCirculateWindowReq;
typedef struct { /* followed by padded string */
CARD8 reqType;
BOOL onlyIfExists;
- CARD16 length B16;
- CARD16 nbytes B16; /* number of bytes in string */
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 nbytes; /* number of bytes in string */
+ CARD16 pad;
} xInternAtomReq;
typedef struct {
CARD8 reqType;
CARD8 mode;
- CARD16 length B16;
- Window window B32;
- Atom property B32, type B32;
+ CARD16 length;
+ Window window;
+ Atom property, type;
CARD8 format;
BYTE pad[3];
- CARD32 nUnits B32; /* length of stuff following, depends on format */
+ CARD32 nUnits; /* length of stuff following, depends on format */
} xChangePropertyReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32;
- Atom property B32;
+ CARD16 length;
+ Window window;
+ Atom property;
} xDeletePropertyReq;
typedef struct {
@@ -1421,101 +1421,101 @@ typedef struct {
#else
BOOL delete;
#endif
- CARD16 length B16;
- Window window B32;
- Atom property B32, type B32;
- CARD32 longOffset B32;
- CARD32 longLength B32;
+ CARD16 length;
+ Window window;
+ Atom property, type;
+ CARD32 longOffset;
+ CARD32 longLength;
} xGetPropertyReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32;
- Atom selection B32;
- Time time B32;
+ CARD16 length;
+ Window window;
+ Atom selection;
+ Time time;
} xSetSelectionOwnerReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window requestor B32;
- Atom selection B32, target B32, property B32;
- Time time B32;
+ CARD16 length;
+ Window requestor;
+ Atom selection, target, property;
+ Time time;
} xConvertSelectionReq;
typedef struct {
CARD8 reqType;
BOOL propagate;
- CARD16 length B16;
- Window destination B32;
- CARD32 eventMask B32;
+ CARD16 length;
+ Window destination;
+ CARD32 eventMask;
xEvent event;
} xSendEventReq;
typedef struct {
CARD8 reqType;
BOOL ownerEvents;
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 eventMask B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 eventMask;
BYTE pointerMode, keyboardMode;
- Window confineTo B32;
- Cursor cursor B32;
- Time time B32;
+ Window confineTo;
+ Cursor cursor;
+ Time time;
} xGrabPointerReq;
typedef struct {
CARD8 reqType;
BOOL ownerEvents;
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 eventMask B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 eventMask;
BYTE pointerMode, keyboardMode;
- Window confineTo B32;
- Cursor cursor B32;
+ Window confineTo;
+ Cursor cursor;
CARD8 button;
BYTE pad;
- CARD16 modifiers B16;
+ CARD16 modifiers;
} xGrabButtonReq;
typedef struct {
CARD8 reqType;
CARD8 button;
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 modifiers B16;
- CARD16 pad B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 modifiers;
+ CARD16 pad;
} xUngrabButtonReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Cursor cursor B32;
- Time time B32;
- CARD16 eventMask B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ Cursor cursor;
+ Time time;
+ CARD16 eventMask;
+ CARD16 pad2;
} xChangeActivePointerGrabReq;
typedef struct {
CARD8 reqType;
BOOL ownerEvents;
- CARD16 length B16;
- Window grabWindow B32;
- Time time B32;
+ CARD16 length;
+ Window grabWindow;
+ Time time;
BYTE pointerMode, keyboardMode;
- CARD16 pad B16;
+ CARD16 pad;
} xGrabKeyboardReq;
typedef struct {
CARD8 reqType;
BOOL ownerEvents;
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 modifiers B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 modifiers;
CARD8 key;
BYTE pointerMode, keyboardMode;
BYTE pad1, pad2, pad3;
@@ -1524,75 +1524,75 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 key;
- CARD16 length B16;
- Window grabWindow B32;
- CARD16 modifiers B16;
- CARD16 pad B16;
+ CARD16 length;
+ Window grabWindow;
+ CARD16 modifiers;
+ CARD16 pad;
} xUngrabKeyReq;
typedef struct {
CARD8 reqType;
CARD8 mode;
- CARD16 length B16;
- Time time B32;
+ CARD16 length;
+ Time time;
} xAllowEventsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32;
- Time start B32, stop B32;
+ CARD16 length;
+ Window window;
+ Time start, stop;
} xGetMotionEventsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window srcWid B32, dstWid B32;
- INT16 srcX B16, srcY B16;
+ CARD16 length;
+ Window srcWid, dstWid;
+ INT16 srcX, srcY;
} xTranslateCoordsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window srcWid B32, dstWid B32;
- INT16 srcX B16, srcY B16;
- CARD16 srcWidth B16, srcHeight B16;
- INT16 dstX B16, dstY B16;
+ CARD16 length;
+ Window srcWid, dstWid;
+ INT16 srcX, srcY;
+ CARD16 srcWidth, srcHeight;
+ INT16 dstX, dstY;
} xWarpPointerReq;
typedef struct {
CARD8 reqType;
CARD8 revertTo;
- CARD16 length B16;
- Window focus B32;
- Time time B32;
+ CARD16 length;
+ Window focus;
+ Time time;
} xSetInputFocusReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Font fid B32;
- CARD16 nbytes B16;
+ CARD16 length;
+ Font fid;
+ CARD16 nbytes;
BYTE pad1, pad2; /* string follows on word boundary */
} xOpenFontReq;
typedef struct {
CARD8 reqType;
BOOL oddLength;
- CARD16 length B16;
- Font fid B32;
+ CARD16 length;
+ Font fid;
} xQueryTextExtentsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD16 maxNames B16;
- CARD16 nbytes B16; /* followed immediately by string bytes */
+ CARD16 length;
+ CARD16 maxNames;
+ CARD16 nbytes; /* followed immediately by string bytes */
} xListFontsReq;
typedef xListFontsReq xListFontsWithInfoReq;
@@ -1600,98 +1600,98 @@ typedef xListFontsReq xListFontsWithInfoReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD16 nFonts B16;
+ CARD16 length;
+ CARD16 nFonts;
BYTE pad1, pad2; /* LISTofSTRING8 follows on word boundary */
} xSetFontPathReq;
typedef struct {
CARD8 reqType;
CARD8 depth;
- CARD16 length B16;
- Pixmap pid B32;
- Drawable drawable B32;
- CARD16 width B16, height B16;
+ CARD16 length;
+ Pixmap pid;
+ Drawable drawable;
+ CARD16 width, height;
} xCreatePixmapReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- GContext gc B32;
- Drawable drawable B32;
- CARD32 mask B32;
+ CARD16 length;
+ GContext gc;
+ Drawable drawable;
+ CARD32 mask;
} xCreateGCReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- GContext gc B32;
- CARD32 mask B32;
+ CARD16 length;
+ GContext gc;
+ CARD32 mask;
} xChangeGCReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- GContext srcGC B32, dstGC B32;
- CARD32 mask B32;
+ CARD16 length;
+ GContext srcGC, dstGC;
+ CARD32 mask;
} xCopyGCReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- GContext gc B32;
- CARD16 dashOffset B16;
- CARD16 nDashes B16; /* length LISTofCARD8 of values following */
+ CARD16 length;
+ GContext gc;
+ CARD16 dashOffset;
+ CARD16 nDashes; /* length LISTofCARD8 of values following */
} xSetDashesReq;
typedef struct {
CARD8 reqType;
BYTE ordering;
- CARD16 length B16;
- GContext gc B32;
- INT16 xOrigin B16, yOrigin B16;
+ CARD16 length;
+ GContext gc;
+ INT16 xOrigin, yOrigin;
} xSetClipRectanglesReq;
typedef struct {
CARD8 reqType;
BOOL exposures;
- CARD16 length B16;
- Window window B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
+ CARD16 length;
+ Window window;
+ INT16 x, y;
+ CARD16 width, height;
} xClearAreaReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Drawable srcDrawable B32, dstDrawable B32;
- GContext gc B32;
- INT16 srcX B16, srcY B16, dstX B16, dstY B16;
- CARD16 width B16, height B16;
+ CARD16 length;
+ Drawable srcDrawable, dstDrawable;
+ GContext gc;
+ INT16 srcX, srcY, dstX, dstY;
+ CARD16 width, height;
} xCopyAreaReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Drawable srcDrawable B32, dstDrawable B32;
- GContext gc B32;
- INT16 srcX B16, srcY B16, dstX B16, dstY B16;
- CARD16 width B16, height B16;
- CARD32 bitPlane B32;
+ CARD16 length;
+ Drawable srcDrawable, dstDrawable;
+ GContext gc;
+ INT16 srcX, srcY, dstX, dstY;
+ CARD16 width, height;
+ CARD32 bitPlane;
} xCopyPlaneReq;
typedef struct {
CARD8 reqType;
BYTE coordMode;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
} xPolyPointReq;
typedef xPolyPointReq xPolyLineReq; /* same request structure */
@@ -1701,9 +1701,9 @@ typedef xPolyPointReq xPolyLineReq; /* same request structure */
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
} xPolySegmentReq;
typedef xPolySegmentReq xPolyArcReq;
@@ -1714,36 +1714,36 @@ typedef xPolySegmentReq xPolyFillArcReq;
typedef struct _FillPolyReq {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
BYTE shape;
BYTE coordMode;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xFillPolyReq;
typedef struct _PutImageReq {
CARD8 reqType;
CARD8 format;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
- CARD16 width B16, height B16;
- INT16 dstX B16, dstY B16;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
+ CARD16 width, height;
+ INT16 dstX, dstY;
CARD8 leftPad;
CARD8 depth;
- CARD16 pad B16;
+ CARD16 pad;
} xPutImageReq;
typedef struct {
CARD8 reqType;
CARD8 format;
- CARD16 length B16;
- Drawable drawable B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD32 planeMask B32;
+ CARD16 length;
+ Drawable drawable;
+ INT16 x, y;
+ CARD16 width, height;
+ CARD32 planeMask;
} xGetImageReq;
/* the following used by PolyText8 and PolyText16 */
@@ -1751,10 +1751,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 pad;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
- INT16 x B16, y B16; /* items (xTextElt) start after struct */
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
+ INT16 x, y; /* items (xTextElt) start after struct */
} xPolyTextReq;
typedef xPolyTextReq xPolyText8Req;
@@ -1763,10 +1763,10 @@ typedef xPolyTextReq xPolyText16Req;
typedef struct {
CARD8 reqType;
BYTE nChars;
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
- INT16 x B16, y B16;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
+ INT16 x, y;
} xImageTextReq;
typedef xImageTextReq xImageText8Req;
@@ -1775,124 +1775,124 @@ typedef xImageTextReq xImageText16Req;
typedef struct {
CARD8 reqType;
BYTE alloc;
- CARD16 length B16;
- Colormap mid B32;
- Window window B32;
- VisualID visual B32;
+ CARD16 length;
+ Colormap mid;
+ Window window;
+ VisualID visual;
} xCreateColormapReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap mid B32;
- Colormap srcCmap B32;
+ CARD16 length;
+ Colormap mid;
+ Colormap srcCmap;
} xCopyColormapAndFreeReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
- CARD16 red B16, green B16, blue B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ Colormap cmap;
+ CARD16 red, green, blue;
+ CARD16 pad2;
} xAllocColorReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
- CARD16 nbytes B16; /* followed by structure */
+ CARD16 length;
+ Colormap cmap;
+ CARD16 nbytes; /* followed by structure */
BYTE pad1, pad2;
} xAllocNamedColorReq;
typedef struct {
CARD8 reqType;
BOOL contiguous;
- CARD16 length B16;
- Colormap cmap B32;
- CARD16 colors B16, planes B16;
+ CARD16 length;
+ Colormap cmap;
+ CARD16 colors, planes;
} xAllocColorCellsReq;
typedef struct {
CARD8 reqType;
BOOL contiguous;
- CARD16 length B16;
- Colormap cmap B32;
- CARD16 colors B16, red B16, green B16, blue B16;
+ CARD16 length;
+ Colormap cmap;
+ CARD16 colors, red, green, blue;
} xAllocColorPlanesReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
- CARD32 planeMask B32;
+ CARD16 length;
+ Colormap cmap;
+ CARD32 planeMask;
} xFreeColorsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
+ CARD16 length;
+ Colormap cmap;
} xStoreColorsReq;
typedef struct {
CARD8 reqType;
CARD8 flags; /* DoRed, DoGreen, DoBlue, as in xColorItem */
- CARD16 length B16;
- Colormap cmap B32;
- CARD32 pixel B32;
- CARD16 nbytes B16; /* number of name string bytes following structure */
+ CARD16 length;
+ Colormap cmap;
+ CARD32 pixel;
+ CARD16 nbytes; /* number of name string bytes following structure */
BYTE pad1, pad2;
} xStoreNamedColorReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
+ CARD16 length;
+ Colormap cmap;
} xQueryColorsReq;
typedef struct { /* followed by string of length len */
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Colormap cmap B32;
- CARD16 nbytes B16; /* number of string bytes following structure*/
+ CARD16 length;
+ Colormap cmap;
+ CARD16 nbytes; /* number of string bytes following structure*/
BYTE pad1, pad2;
} xLookupColorReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Cursor cid B32;
- Pixmap source B32, mask B32;
- CARD16 foreRed B16, foreGreen B16, foreBlue B16;
- CARD16 backRed B16, backGreen B16, backBlue B16;
- CARD16 x B16, y B16;
+ CARD16 length;
+ Cursor cid;
+ Pixmap source, mask;
+ CARD16 foreRed, foreGreen, foreBlue;
+ CARD16 backRed, backGreen, backBlue;
+ CARD16 x, y;
} xCreateCursorReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Cursor cid B32;
- Font source B32, mask B32;
- CARD16 sourceChar B16, maskChar B16;
- CARD16 foreRed B16, foreGreen B16, foreBlue B16;
- CARD16 backRed B16, backGreen B16, backBlue B16;
+ CARD16 length;
+ Cursor cid;
+ Font source, mask;
+ CARD16 sourceChar, maskChar;
+ CARD16 foreRed, foreGreen, foreBlue;
+ CARD16 backRed, backGreen, backBlue;
} xCreateGlyphCursorReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Cursor cursor B32;
- CARD16 foreRed B16, foreGreen B16, foreBlue B16;
- CARD16 backRed B16, backGreen B16, backBlue B16;
+ CARD16 length;
+ Cursor cursor;
+ CARD16 foreRed, foreGreen, foreBlue;
+ CARD16 backRed, backGreen, backBlue;
} xRecolorCursorReq;
typedef struct {
@@ -1902,99 +1902,99 @@ typedef struct {
#else
CARD8 class;
#endif
- CARD16 length B16;
- Drawable drawable B32;
- CARD16 width B16, height B16;
+ CARD16 length;
+ Drawable drawable;
+ CARD16 width, height;
} xQueryBestSizeReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD16 nbytes B16; /* number of string bytes following structure */
+ CARD16 length;
+ CARD16 nbytes; /* number of string bytes following structure */
BYTE pad1, pad2;
} xQueryExtensionReq;
typedef struct {
CARD8 reqType;
CARD8 numKeyPerModifier;
- CARD16 length B16;
+ CARD16 length;
} xSetModifierMappingReq;
typedef struct {
CARD8 reqType;
- CARD8 nElts; /* how many elements in the map */
- CARD16 length B16;
+ CARD8 nElts; /* how many elements in the map */
+ CARD16 length;
} xSetPointerMappingReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
+ CARD16 length;
KeyCode firstKeyCode;
CARD8 count;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xGetKeyboardMappingReq;
typedef struct {
CARD8 reqType;
CARD8 keyCodes;
- CARD16 length B16;
+ CARD16 length;
KeyCode firstKeyCode;
CARD8 keySymsPerKeyCode;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xChangeKeyboardMappingReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD32 mask B32;
+ CARD16 length;
+ CARD32 mask;
} xChangeKeyboardControlReq;
typedef struct {
CARD8 reqType;
INT8 percent; /* -100 to 100 */
- CARD16 length B16;
+ CARD16 length;
} xBellReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- INT16 accelNum B16, accelDenum B16;
- INT16 threshold B16;
+ CARD16 length;
+ INT16 accelNum, accelDenum;
+ INT16 threshold;
BOOL doAccel, doThresh;
} xChangePointerControlReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- INT16 timeout B16, interval B16;
+ CARD16 length;
+ INT16 timeout, interval;
BYTE preferBlank, allowExpose;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xSetScreenSaverReq;
typedef struct {
CARD8 reqType;
BYTE mode;
- CARD16 length B16;
+ CARD16 length;
CARD8 hostFamily;
BYTE pad;
- CARD16 hostLength B16;
+ CARD16 hostLength;
} xChangeHostsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
+ CARD16 length;
} xListHostsReq;
typedef struct {
CARD8 reqType;
BYTE mode;
- CARD16 length B16;
+ CARD16 length;
} xChangeModeReq;
typedef xChangeModeReq xSetAccessControlReq;
@@ -2004,10 +2004,10 @@ typedef xChangeModeReq xForceScreenSaverReq;
typedef struct { /* followed by LIST of ATOM */
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Window window B32;
- CARD16 nAtoms B16;
- INT16 nPositions B16;
+ CARD16 length;
+ Window window;
+ CARD16 nAtoms;
+ INT16 nPositions;
} xRotatePropertiesReq;
diff --git a/include/X11/Xprotostr.h b/include/X11/Xprotostr.h
index 21e39fd..07d017d 100644
--- a/include/X11/Xprotostr.h
+++ b/include/X11/Xprotostr.h
@@ -52,26 +52,26 @@ SOFTWARE.
/* Used by PolySegment */
typedef struct _xSegment {
- INT16 x1 B16, y1 B16, x2 B16, y2 B16;
+ INT16 x1, y1, x2, y2;
} xSegment;
/* POINT */
typedef struct _xPoint {
- INT16 x B16, y B16;
+ INT16 x, y;
} xPoint;
typedef struct _xRectangle {
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
+ INT16 x, y;
+ CARD16 width, height;
} xRectangle;
/* ARC */
typedef struct _xArc {
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- INT16 angle1 B16, angle2 B16;
+ INT16 x, y;
+ CARD16 width, height;
+ INT16 angle1, angle2;
} xArc;
#endif /* XPROTOSTRUCTS_H */
diff --git a/include/X11/dri/xf86driproto.h b/include/X11/dri/xf86driproto.h
index 4b71469..509b115 100644
--- a/include/X11/dri/xf86driproto.h
+++ b/include/X11/dri/xf86driproto.h
@@ -57,214 +57,214 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
typedef struct _XF86DRIQueryVersion {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86DRIQueryVersionReq;
#define sz_xXF86DRIQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of DRI protocol */
- CARD16 minorVersion B16; /* minor version of DRI protocol */
- CARD32 patchVersion B32; /* patch version of DRI protocol */
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of DRI protocol */
+ CARD16 minorVersion; /* minor version of DRI protocol */
+ CARD32 patchVersion; /* patch version of DRI protocol */
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRIQueryVersionReply;
#define sz_xXF86DRIQueryVersionReply 32
typedef struct _XF86DRIQueryDirectRenderingCapable {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* X_DRIQueryDirectRenderingCapable */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXF86DRIQueryDirectRenderingCapableReq;
#define sz_xXF86DRIQueryDirectRenderingCapableReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL isCapable;
BOOL pad2;
BOOL pad3;
BOOL pad4;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
- CARD32 pad8 B32;
- CARD32 pad9 B32;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
+ CARD32 pad8;
+ CARD32 pad9;
} xXF86DRIQueryDirectRenderingCapableReply;
#define sz_xXF86DRIQueryDirectRenderingCapableReply 32
typedef struct _XF86DRIOpenConnection {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIOpenConnection */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXF86DRIOpenConnectionReq;
#define sz_xXF86DRIOpenConnectionReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 hSAREALow B32;
- CARD32 hSAREAHigh B32;
- CARD32 busIdStringLength B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
- CARD32 pad8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 hSAREALow;
+ CARD32 hSAREAHigh;
+ CARD32 busIdStringLength;
+ CARD32 pad6;
+ CARD32 pad7;
+ CARD32 pad8;
} xXF86DRIOpenConnectionReply;
#define sz_xXF86DRIOpenConnectionReply 32
typedef struct _XF86DRIAuthConnection {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRICloseConnection */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 magic B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 magic;
} xXF86DRIAuthConnectionReq;
#define sz_xXF86DRIAuthConnectionReq 12
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 authenticated B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 authenticated;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRIAuthConnectionReply;
#define zx_xXF86DRIAuthConnectionReply 32
typedef struct _XF86DRICloseConnection {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRICloseConnection */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXF86DRICloseConnectionReq;
#define sz_xXF86DRICloseConnectionReq 8
typedef struct _XF86DRIGetClientDriverName {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIGetClientDriverName */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXF86DRIGetClientDriverNameReq;
#define sz_xXF86DRIGetClientDriverNameReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 ddxDriverMajorVersion B32;
- CARD32 ddxDriverMinorVersion B32;
- CARD32 ddxDriverPatchVersion B32;
- CARD32 clientDriverNameLength B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 ddxDriverMajorVersion;
+ CARD32 ddxDriverMinorVersion;
+ CARD32 ddxDriverPatchVersion;
+ CARD32 clientDriverNameLength;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRIGetClientDriverNameReply;
#define sz_xXF86DRIGetClientDriverNameReply 32
typedef struct _XF86DRICreateContext {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRICreateContext */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 visual B32;
- CARD32 context B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 visual;
+ CARD32 context;
} xXF86DRICreateContextReq;
#define sz_xXF86DRICreateContextReq 16
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 hHWContext B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 hHWContext;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRICreateContextReply;
#define sz_xXF86DRICreateContextReply 32
typedef struct _XF86DRIDestroyContext {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIDestroyContext */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 context B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 context;
} xXF86DRIDestroyContextReq;
#define sz_xXF86DRIDestroyContextReq 12
typedef struct _XF86DRICreateDrawable {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRICreateDrawable */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 drawable;
} xXF86DRICreateDrawableReq;
#define sz_xXF86DRICreateDrawableReq 12
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 hHWDrawable B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 hHWDrawable;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRICreateDrawableReply;
#define sz_xXF86DRICreateDrawableReply 32
typedef struct _XF86DRIDestroyDrawable {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIDestroyDrawable */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 drawable;
} xXF86DRIDestroyDrawableReq;
#define sz_xXF86DRIDestroyDrawableReq 12
typedef struct _XF86DRIGetDrawableInfo {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIGetDrawableInfo */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 drawable;
} xXF86DRIGetDrawableInfoReq;
#define sz_xXF86DRIGetDrawableInfoReq 12
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 drawableTableIndex B32;
- CARD32 drawableTableStamp B32;
- INT16 drawableX B16;
- INT16 drawableY B16;
- INT16 drawableWidth B16;
- INT16 drawableHeight B16;
- CARD32 numClipRects B32;
- INT16 backX B16;
- INT16 backY B16;
- CARD32 numBackClipRects B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 drawableTableIndex;
+ CARD32 drawableTableStamp;
+ INT16 drawableX;
+ INT16 drawableY;
+ INT16 drawableWidth;
+ INT16 drawableHeight;
+ CARD32 numClipRects;
+ INT16 backX;
+ INT16 backY;
+ CARD32 numBackClipRects;
} xXF86DRIGetDrawableInfoReply;
#define sz_xXF86DRIGetDrawableInfoReply 36
@@ -273,68 +273,68 @@ typedef struct {
typedef struct _XF86DRIGetDeviceInfo {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIGetDeviceInfo */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXF86DRIGetDeviceInfoReq;
#define sz_xXF86DRIGetDeviceInfoReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 hFrameBufferLow B32;
- CARD32 hFrameBufferHigh B32;
- CARD32 framebufferOrigin B32;
- CARD32 framebufferSize B32;
- CARD32 framebufferStride B32;
- CARD32 devPrivateSize B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 hFrameBufferLow;
+ CARD32 hFrameBufferHigh;
+ CARD32 framebufferOrigin;
+ CARD32 framebufferSize;
+ CARD32 framebufferStride;
+ CARD32 devPrivateSize;
} xXF86DRIGetDeviceInfoReply;
#define sz_xXF86DRIGetDeviceInfoReply 32
typedef struct _XF86DRIOpenFullScreen {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRIOpenFullScreen */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 drawable;
} xXF86DRIOpenFullScreenReq;
#define sz_xXF86DRIOpenFullScreenReq 12
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 isFullScreen B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 isFullScreen;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DRIOpenFullScreenReply;
#define sz_xXF86DRIOpenFullScreenReply 32
typedef struct _XF86DRICloseFullScreen {
CARD8 reqType; /* always DRIReqCode */
CARD8 driReqType; /* always X_DRICloseFullScreen */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 drawable;
} xXF86DRICloseFullScreenReq;
#define sz_xXF86DRICloseFullScreenReq 12
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXF86DRICloseFullScreenReply;
#define sz_xXF86DRICloseFullScreenReply 32
diff --git a/include/X11/extensions/EVIproto.h b/include/X11/extensions/EVIproto.h
index afa282a..2218ef2 100644
--- a/include/X11/extensions/EVIproto.h
+++ b/include/X11/extensions/EVIproto.h
@@ -35,59 +35,59 @@ typedef CARD32 VisualID32;
#define sz_VisualID32 4
typedef struct _xExtendedVisualInfo {
- VisualID core_visual_id B32;
+ VisualID core_visual_id;
INT8 screen;
INT8 level;
CARD8 transparency_type;
CARD8 pad0;
- CARD32 transparency_value B32;
+ CARD32 transparency_value;
CARD8 min_hw_colormaps;
CARD8 max_hw_colormaps;
- CARD16 num_colormap_conflicts B16;
+ CARD16 num_colormap_conflicts;
} xExtendedVisualInfo;
#define sz_xExtendedVisualInfo 16
typedef struct _XEVIQueryVersion {
CARD8 reqType; /* always XEVIReqCode */
CARD8 xeviReqType; /* always X_EVIQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xEVIQueryVersionReq;
#define sz_xEVIQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of EVI protocol */
- CARD16 minorVersion B16; /* minor version of EVI protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of EVI protocol */
+ CARD16 minorVersion; /* minor version of EVI protocol */
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xEVIQueryVersionReply;
#define sz_xEVIQueryVersionReply 32
typedef struct _XEVIGetVisualInfoReq {
CARD8 reqType; /* always XEVIReqCode */
CARD8 xeviReqType; /* always X_EVIGetVisualInfo */
- CARD16 length B16;
- CARD32 n_visual B32;
+ CARD16 length;
+ CARD32 n_visual;
} xEVIGetVisualInfoReq;
#define sz_xEVIGetVisualInfoReq 8
typedef struct _XEVIGetVisualInfoReply {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 n_info B32;
- CARD32 n_conflicts B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 n_info;
+ CARD32 n_conflicts;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xEVIGetVisualInfoReply;
#define sz_xEVIGetVisualInfoReply 32
diff --git a/include/X11/extensions/Printstr.h b/include/X11/extensions/Printstr.h
index 1d763c6..7c3e8ad 100644
--- a/include/X11/extensions/Printstr.h
+++ b/include/X11/extensions/Printstr.h
@@ -138,16 +138,16 @@ typedef struct _xPrintPrintEvent {
BYTE detail; /* XPStartJobNotify, XPEndJobNotify,
XPStartDocNotify, XPEndDocNotify,
XPStartPageNotify, XPEndPageNotify */
- CARD16 sequenceNumber B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 sequenceNumber;
+ PCONTEXT printContext; /* print context */
BOOL cancel; /* canceled flag */
CARD8 pad1; /* rest is unused */
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xPrintPrintEvent;
#define sz_xPrintPrintEvent 32;
@@ -156,14 +156,14 @@ typedef struct _xPrintAttributeEvent {
BYTE detail; /* XPJobAttr, XPDocAttr, XPPageAttr,
XPPrinterAttr, XPSpoolerAttr,
XPMediumAttr, XPServerAttr */
- CARD16 sequenceNumber B16;
- PCONTEXT printContext B32; /* print context */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ PCONTEXT printContext; /* print context */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xPrintAttributeEvent;
#define sz_xPrintAttributeEvent 32;
@@ -175,22 +175,22 @@ typedef struct _xPrintAttributeEvent {
typedef struct _PrintQueryVersion {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xPrintQueryVersionReq;
#define sz_xPrintQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Xp protocol */
- CARD16 minorVersion B16; /* minor version of Xp protocol */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of Xp protocol */
+ CARD16 minorVersion; /* minor version of Xp protocol */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xPrintQueryVersionReply;
#define sz_xPrintQueryVersionReply 32
@@ -198,9 +198,9 @@ typedef struct {
typedef struct _PrintGetPrinterList {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetPrinterList */
- CARD16 length B16;
- CARD32 printerNameLen B32; /* length of printer name */
- CARD32 localeLen B32; /* length of locale string */
+ CARD16 length;
+ CARD32 printerNameLen; /* length of printer name */
+ CARD32 localeLen; /* length of locale string */
/* variable portion *****************************************
STRING8 printerName; * printer name *
@@ -214,21 +214,21 @@ typedef struct _PrintGetPrinterList {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 listCount B32; /* of PRINTER recs below */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 listCount; /* of PRINTER recs below */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
/* variable portion *****************************************
- CARD32 nameLen B32; * length of name in bytes *
+ CARD32 nameLen; * length of name in bytes *
STRING8 name; * name *
BYTE pad(nameLen) * unused *
- CARD32 descLen B32; * length of desc in bytes *
+ CARD32 descLen; * length of desc in bytes *
STRING8 desc; * localized description *
BYTE pad(descLen) * unused *
************************************************************/
@@ -239,7 +239,7 @@ typedef struct {
typedef struct _PrintRehashPrinterList {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintRehashPrinterList */
- CARD16 length B16;
+ CARD16 length;
} xPrintRehashPrinterListReq;
#define sz_xPrintRehashPrinterListReq 4
@@ -247,10 +247,10 @@ typedef struct _PrintRehashPrinterList {
typedef struct _PrintCreateContext {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintInitSetContext */
- CARD16 length B16;
- CARD32 contextID B32; /* ID for context */
- CARD32 printerNameLen B32; /* length of printerName in bytes */
- CARD32 localeLen B32; /* length of locale in bytes */
+ CARD16 length;
+ CARD32 contextID; /* ID for context */
+ CARD32 printerNameLen; /* length of printerName in bytes */
+ CARD32 localeLen; /* length of locale in bytes */
/* variable portion *****************************************
STRING8 printerName * printer name *
@@ -265,8 +265,8 @@ typedef struct _PrintCreateContext {
typedef struct _PrintSetContext {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintSetContext */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintSetContextReq;
#define sz_xPrintSetContextReq 8
@@ -274,21 +274,21 @@ typedef struct _PrintSetContext {
typedef struct _PrintGetContext {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetContext */
- CARD16 length B16;
+ CARD16 length;
} xPrintGetContextReq;
#define sz_xPrintGetContextReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- PCONTEXT printContext B32; /* print context */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ PCONTEXT printContext; /* print context */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xPrintGetContextReply;
#define sz_xPrintGetContextReply 32
@@ -296,8 +296,8 @@ typedef struct {
typedef struct _PrintDestroyContext {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintDestroyContext */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintDestroyContextReq;
#define sz_xPrintDestroyContextReq 8
@@ -305,22 +305,22 @@ typedef struct _PrintDestroyContext {
typedef struct _PrintGetContextScreen {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetContextScreen */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintGetContextScreenReq;
#define sz_xPrintGetContextScreenReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
WINDOW rootWindow; /* screenPtr represented as rootWin */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xPrintGetContextScreenReply;
#define sz_xPrintGetContextScreenReply 32
@@ -328,20 +328,20 @@ typedef struct {
typedef struct _PrintStartJob {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintStartJob */
- CARD16 length B16;
+ CARD16 length;
CARD8 saveData; /* save data boolean */
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xPrintStartJobReq;
#define sz_xPrintStartJobReq 8
typedef struct _PrintEndJob {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintEndJob */
- CARD16 length B16;
+ CARD16 length;
BOOL cancel; /* cancel boolean */
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xPrintEndJobReq;
#define sz_xPrintEndJobReq 8
@@ -349,20 +349,20 @@ typedef struct _PrintEndJob {
typedef struct _PrintStartDoc {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintStartDoc */
- CARD16 length B16;
+ CARD16 length;
CARD8 type; /* type for document */
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xPrintStartDocReq;
#define sz_xPrintStartDocReq 8
typedef struct _PrintEndDoc {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintEndDoc */
- CARD16 length B16;
+ CARD16 length;
BOOL cancel; /* cancel boolean */
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xPrintEndDocReq;
#define sz_xPrintEndDocReq 8
@@ -370,9 +370,9 @@ typedef struct _PrintEndDoc {
typedef struct _PrintPutDocumentData {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintPutDocumentData */
- CARD16 length B16;
- DRAWABLE drawable B32; /* target drawable */
- CARD32 len_data B32; /* big len in bytes */
+ CARD16 length;
+ DRAWABLE drawable; /* target drawable */
+ CARD32 len_data; /* big len in bytes */
CARD16 len_fmt; /* len in bytes */
CARD16 len_options; /* len in bytes */
@@ -391,23 +391,23 @@ typedef struct _PrintPutDocumentData {
typedef struct _PrintGetDocumentData {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetDocumentData */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
- CARD32 maxBufferSize B32; /* maximum buffer size requested */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
+ CARD32 maxBufferSize; /* maximum buffer size requested */
} xPrintGetDocumentDataReq;
#define sz_xPrintGetDocumentDataReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 statusCode B32; /* status code for reply */
- CARD32 finishedFlag B32; /* is this the last reply */
- CARD32 dataLen B32; /* data length */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 statusCode; /* status code for reply */
+ CARD32 finishedFlag; /* is this the last reply */
+ CARD32 dataLen; /* data length */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
/* variable portion *****************************************
LISTofBYTE data; * data *
@@ -420,18 +420,18 @@ typedef struct {
typedef struct _PrintStartPage {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintStartPage */
- CARD16 length B16;
- WINDOW window B32; /* window */
+ CARD16 length;
+ WINDOW window; /* window */
} xPrintStartPageReq;
#define sz_xPrintStartPageReq 8
typedef struct _PrintEndPage {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintEndPage */
- CARD16 length B16;
+ CARD16 length;
BOOL cancel; /* cancel boolean */
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xPrintEndPageReq;
#define sz_xPrintEndPageReq 8
@@ -439,9 +439,9 @@ typedef struct _PrintEndPage {
typedef struct _PrintSelectInput {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintSelectInput */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
- BITMASK eventMask B32;
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
+ BITMASK eventMask;
} xPrintSelectInputReq;
#define sz_xPrintSelectInputReq 12
@@ -449,47 +449,47 @@ typedef struct _PrintSelectInput {
typedef struct _PrintInputSelected {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintInputSelected */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintInputSelectedReq;
#define sz_xPrintInputSelectedReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- BITMASK eventMask B32; /* your event mask */
- BITMASK allEventsMask B32; /* all event mask */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ BITMASK eventMask; /* your event mask */
+ BITMASK allEventsMask; /* all event mask */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xPrintInputSelectedReply;
#define sz_xPrintInputSelectedReply 32
typedef struct _PrintGetAttributes {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetAttributes */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
CARD8 type; /* type */
CARD8 pad1; /* unused */
- CARD16 pad2 B16; /* unused */
+ CARD16 pad2; /* unused */
} xPrintGetAttributesReq;
#define sz_xPrintGetAttributesReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 stringLen B32; /* length of xrm db string */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 stringLen; /* length of xrm db string */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
/* variable portion *****************************************
STRING8 string; * xrm db as a string *
@@ -502,12 +502,12 @@ typedef struct {
typedef struct _PrintSetAttributes {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintSetAttributes */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
- CARD32 stringLen B32; /* length of xrm db string */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
+ CARD32 stringLen; /* length of xrm db string */
CARD8 type; /* type */
CARD8 rule; /* replacement rule */
- CARD16 pad1 B16; /* unused */
+ CARD16 pad1; /* unused */
/* variable portion *****************************************
STRING8 string; * xrm db as a string *
@@ -520,12 +520,12 @@ typedef struct _PrintSetAttributes {
typedef struct _PrintGetOneAttribute {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetOneAttribute */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
CARD32 nameLen; /* length of name string */
CARD8 type; /* type */
CARD8 pad1; /* unused */
- CARD16 pad2 B16; /* unused */
+ CARD16 pad2; /* unused */
/* variable portion *****************************************
STRING8 name; * name as a string *
@@ -537,14 +537,14 @@ typedef struct _PrintGetOneAttribute {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 valueLen B32; /* length of value string */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 valueLen; /* length of value string */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
/* variable portion *****************************************
STRING8 value; * value as a string *
@@ -557,25 +557,25 @@ typedef struct {
typedef struct _PrintGetPageDimensions {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetPageDimensions */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintGetPageDimensionsReq;
#define sz_xPrintGetPageDimensionsReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD16 width; /* total pixel width */
CARD16 height; /* total pixel height */
CARD16 rx; /* reproducable x pixel offset */
CARD16 ry; /* reproducable y pixel offset */
CARD16 rwidth; /* reproducable x pixel width */
CARD16 rheight; /* reproducable y pixel width */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xPrintGetPageDimensionsReply;
#define sz_xPrintGetPageDimensionsReply 32
@@ -583,21 +583,21 @@ typedef struct {
typedef struct _PrintQueryScreens {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintQueryScreens */
- CARD16 length B16;
+ CARD16 length;
} xPrintQueryScreensReq;
#define sz_xPrintQueryScreensReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD32 listCount; /* number of screens following */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
/* variable portion *****************************************
WINDOW rootWindow; * root window of screen *
@@ -608,48 +608,48 @@ typedef struct {
typedef struct _PrintSetImageResolution {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintSetImageResolution */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
- CARD16 imageRes B16; /* image resolution */
- CARD16 pad1 B16;
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
+ CARD16 imageRes; /* image resolution */
+ CARD16 pad1;
} xPrintSetImageResolutionReq;
#define sz_xPrintSetImageResolutionReq 12
typedef struct {
BYTE type; /* X_Reply */
BOOL status; /* accepted or not */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 prevRes B16; /* previous resolution */
- CARD16 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 prevRes; /* previous resolution */
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xPrintSetImageResolutionReply;
#define sz_xPrintSetImageResolutionReply 32
typedef struct _PrintGetImageResolution {
CARD8 reqType; /* always PrintReqCode */
CARD8 printReqType; /* always X_PrintGetImageResolution */
- CARD16 length B16;
- PCONTEXT printContext B32; /* print context */
+ CARD16 length;
+ PCONTEXT printContext; /* print context */
} xPrintGetImageResolutionReq;
#define sz_xPrintGetImageResolutionReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 imageRes B16; /* image resolution */
- CARD16 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 imageRes; /* image resolution */
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xPrintGetImageResolutionReply;
#define sz_xPrintGetImageResolutionReply 32
diff --git a/include/X11/extensions/XIproto.h b/include/X11/extensions/XIproto.h
index 82323d8..ac1f096 100644
--- a/include/X11/extensions/XIproto.h
+++ b/include/X11/extensions/XIproto.h
@@ -177,24 +177,24 @@ struct tmask
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 {
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 @@ typedef struct _xAnyClassinfo {
} xAnyClassInfo;
typedef struct _xDeviceInfo {
- CARD32 type B32;
+ CARD32 type;
CARD8 id;
CARD8 num_classes;
CARD8 use; /* IsXPointer | IsXKeyboard | IsXExtension... */
@@ -255,7 +255,7 @@ typedef struct _xKeyInfo {
CARD8 length;
KeyCode min_keycode;
KeyCode max_keycode;
- CARD16 num_keys B16;
+ CARD16 num_keys;
CARD8 pad1,pad2;
} xKeyInfo;
@@ -268,7 +268,7 @@ typedef struct _xButtonInfo {
CARD8 class;
#endif
CARD8 length;
- CARD16 num_buttons B16;
+ CARD16 num_buttons;
} xButtonInfo;
typedef struct _xValuatorInfo *xValuatorInfoPtr;
@@ -282,15 +282,15 @@ typedef struct _xValuatorInfo {
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 _xAxisInfo {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 @@ typedef struct {
} 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 @@ typedef struct {
} 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 {
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 {
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 {
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 {
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 {
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 @@ typedef struct
{
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 @@ typedef struct
{
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 @@ typedef struct
{
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 @@ typedef struct
{
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 @@ typedef struct
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 keys[28];
} deviceKeyStateNotify;
@@ -1653,7 +1653,7 @@ typedef struct
{
BYTE type;
BYTE deviceid;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 buttons[28];
} deviceButtonStateNotify;
@@ -1668,17 +1668,17 @@ typedef struct
{
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 @@ typedef struct
{
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 @@ typedef struct
{
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 @@ typedef struct
{
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 --git a/include/X11/extensions/XKBproto.h b/include/X11/extensions/XKBproto.h
index de0eee8..43b18d8 100644
--- a/include/X11/extensions/XKBproto.h
+++ b/include/X11/extensions/XKBproto.h
@@ -41,98 +41,98 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
typedef struct _xkbUseExtension {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBUseExtension */
- CARD16 length B16;
- CARD16 wantedMajor B16;
- CARD16 wantedMinor B16;
+ CARD16 length;
+ CARD16 wantedMajor;
+ CARD16 wantedMinor;
} xkbUseExtensionReq;
#define sz_xkbUseExtensionReq 8
typedef struct _xkbUseExtensionReply {
BYTE type; /* X_Reply */
BOOL supported;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 serverMajor B16;
- CARD16 serverMinor B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 serverMajor;
+ CARD16 serverMinor;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xkbUseExtensionReply;
#define sz_xkbUseExtensionReply 32
typedef struct _xkbSelectEvents {
CARD8 reqType;
CARD8 xkbReqType; /* X_KBSelectEvents */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 affectWhich B16;
- CARD16 clear B16;
- CARD16 selectAll B16;
- CARD16 affectMap B16;
- CARD16 map B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 affectWhich;
+ CARD16 clear;
+ CARD16 selectAll;
+ CARD16 affectMap;
+ CARD16 map;
} xkbSelectEventsReq;
#define sz_xkbSelectEventsReq 16
typedef struct _xkbBell {
CARD8 reqType;
CARD8 xkbReqType; /* X_KBBell */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 bellClass B16;
- CARD16 bellID B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 bellClass;
+ CARD16 bellID;
INT8 percent;
BOOL forceSound;
BOOL eventOnly;
CARD8 pad1;
- INT16 pitch B16;
- INT16 duration B16;
- CARD16 pad2 B16;
- Atom name B32;
- Window window B32;
+ INT16 pitch;
+ INT16 duration;
+ CARD16 pad2;
+ Atom name;
+ Window window;
} xkbBellReq;
#define sz_xkbBellReq 28
typedef struct _xkbGetState {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetState */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad;
} xkbGetStateReq;
#define sz_xkbGetStateReq 8
typedef struct _xkbGetStateReply {
BYTE type;
BYTE deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 mods;
CARD8 baseMods;
CARD8 latchedMods;
CARD8 lockedMods;
CARD8 group;
CARD8 lockedGroup;
- INT16 baseGroup B16;
- INT16 latchedGroup B16;
+ INT16 baseGroup;
+ INT16 latchedGroup;
CARD8 compatState;
CARD8 grabMods;
CARD8 compatGrabMods;
CARD8 lookupMods;
CARD8 compatLookupMods;
CARD8 pad1;
- CARD16 ptrBtnState B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
+ CARD16 ptrBtnState;
+ CARD16 pad2;
+ CARD32 pad3;
} xkbGetStateReply;
#define sz_xkbGetStateReply 32
typedef struct _xkbLatchLockState {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBLatchLockState */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 affectModLocks;
CARD8 modLocks;
BOOL lockGroup;
@@ -141,24 +141,24 @@ typedef struct _xkbLatchLockState {
CARD8 modLatches;
CARD8 pad;
BOOL latchGroup;
- INT16 groupLatch B16;
+ INT16 groupLatch;
} xkbLatchLockStateReq;
#define sz_xkbLatchLockStateReq 16
typedef struct _xkbGetControls {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetControls */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad;
} xkbGetControlsReq;
#define sz_xkbGetControlsReq 8
typedef struct _xkbGetControlsReply {
BYTE type; /* X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 mkDfltBtn;
CARD8 numGroups;
CARD8 groupsWrap;
@@ -167,25 +167,25 @@ typedef struct _xkbGetControlsReply {
CARD8 internalRealMods;
CARD8 ignoreLockRealMods;
CARD8 pad1;
- CARD16 internalVMods B16;
- CARD16 ignoreLockVMods B16;
- CARD16 repeatDelay B16;
- CARD16 repeatInterval B16;
- CARD16 slowKeysDelay B16;
- CARD16 debounceDelay B16;
- CARD16 mkDelay B16;
- CARD16 mkInterval B16;
- CARD16 mkTimeToMax B16;
- CARD16 mkMaxSpeed B16;
- INT16 mkCurve B16;
- CARD16 axOptions B16;
- CARD16 axTimeout B16;
- CARD16 axtOptsMask B16;
- CARD16 axtOptsValues B16;
- CARD16 pad2 B16;
- CARD32 axtCtrlsMask B32;
- CARD32 axtCtrlsValues B32;
- CARD32 enabledCtrls B32;
+ CARD16 internalVMods;
+ CARD16 ignoreLockVMods;
+ CARD16 repeatDelay;
+ CARD16 repeatInterval;
+ CARD16 slowKeysDelay;
+ CARD16 debounceDelay;
+ CARD16 mkDelay;
+ CARD16 mkInterval;
+ CARD16 mkTimeToMax;
+ CARD16 mkMaxSpeed;
+ INT16 mkCurve;
+ CARD16 axOptions;
+ CARD16 axTimeout;
+ CARD16 axtOptsMask;
+ CARD16 axtOptsValues;
+ CARD16 pad2;
+ CARD32 axtCtrlsMask;
+ CARD32 axtCtrlsValues;
+ CARD32 enabledCtrls;
BYTE perKeyRepeat[XkbPerKeyBitArraySize];
} xkbGetControlsReply;
#define sz_xkbGetControlsReply 92
@@ -193,37 +193,37 @@ typedef struct _xkbGetControlsReply {
typedef struct _xkbSetControls {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetControls */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 affectInternalMods;
CARD8 internalMods;
CARD8 affectIgnoreLockMods;
CARD8 ignoreLockMods;
- CARD16 affectInternalVMods B16;
- CARD16 internalVMods B16;
- CARD16 affectIgnoreLockVMods B16;
- CARD16 ignoreLockVMods B16;
+ CARD16 affectInternalVMods;
+ CARD16 internalVMods;
+ CARD16 affectIgnoreLockVMods;
+ CARD16 ignoreLockVMods;
CARD8 mkDfltBtn;
CARD8 groupsWrap;
- CARD16 axOptions B16;
- CARD16 pad1 B16;
- CARD32 affectEnabledCtrls B32;
- CARD32 enabledCtrls B32;
- CARD32 changeCtrls B32;
- CARD16 repeatDelay B16;
- CARD16 repeatInterval B16;
- CARD16 slowKeysDelay B16;
- CARD16 debounceDelay B16;
- CARD16 mkDelay B16;
- CARD16 mkInterval B16;
- CARD16 mkTimeToMax B16;
- CARD16 mkMaxSpeed B16;
- INT16 mkCurve B16;
- CARD16 axTimeout B16;
- CARD32 axtCtrlsMask B32;
- CARD32 axtCtrlsValues B32;
- CARD16 axtOptsMask B16;
- CARD16 axtOptsValues B16;
+ CARD16 axOptions;
+ CARD16 pad1;
+ CARD32 affectEnabledCtrls;
+ CARD32 enabledCtrls;
+ CARD32 changeCtrls;
+ CARD16 repeatDelay;
+ CARD16 repeatInterval;
+ CARD16 slowKeysDelay;
+ CARD16 debounceDelay;
+ CARD16 mkDelay;
+ CARD16 mkInterval;
+ CARD16 mkTimeToMax;
+ CARD16 mkMaxSpeed;
+ INT16 mkCurve;
+ CARD16 axTimeout;
+ CARD32 axtCtrlsMask;
+ CARD32 axtCtrlsValues;
+ CARD16 axtOptsMask;
+ CARD16 axtOptsValues;
BYTE perKeyRepeat[XkbPerKeyBitArraySize];
} xkbSetControlsReq;
#define sz_xkbSetControlsReq 100
@@ -233,29 +233,29 @@ typedef struct _xkbKTMapEntryWireDesc {
CARD8 mask;
CARD8 level;
CARD8 realMods;
- CARD16 virtualMods B16;
- CARD16 pad B16;
+ CARD16 virtualMods;
+ CARD16 pad;
} xkbKTMapEntryWireDesc;
#define sz_xkbKTMapEntryWireDesc 8
typedef struct _xkbKTSetMapEntryWireDesc {
CARD8 level;
CARD8 realMods;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
} xkbKTSetMapEntryWireDesc;
#define sz_xkbKTSetMapEntryWireDesc 4
typedef struct _xkbModsWireDesc {
CARD8 mask; /* GetMap only */
CARD8 realMods;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
} xkbModsWireDesc;
#define sz_xkbModsWireDesc 4
typedef struct _xkbKeyTypeWireDesc {
CARD8 mask;
CARD8 realMods;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
CARD8 numLevels;
CARD8 nMapEntries;
BOOL preserve;
@@ -267,14 +267,14 @@ typedef struct _xkbSymMapWireDesc {
CARD8 ktIndex[XkbNumKbdGroups];
CARD8 groupInfo;
CARD8 width;
- CARD16 nSyms B16;
+ CARD16 nSyms;
} xkbSymMapWireDesc;
#define sz_xkbSymMapWireDesc 8
typedef struct _xkbVModMapWireDesc {
KeyCode key;
CARD8 pad;
- CARD16 vmods B16;
+ CARD16 vmods;
} xkbVModMapWireDesc;
#define sz_xkbVModMapWireDesc 4
@@ -295,10 +295,10 @@ typedef struct _xkbActionWireDesc {
typedef struct _xkbGetMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 full B16;
- CARD16 partial B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 full;
+ CARD16 partial;
CARD8 firstType;
CARD8 nTypes;
KeyCode firstKeySym;
@@ -307,34 +307,34 @@ typedef struct _xkbGetMap {
CARD8 nKeyActs;
KeyCode firstKeyBehavior;
CARD8 nKeyBehaviors;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
KeyCode firstKeyExplicit;
CARD8 nKeyExplicit;
KeyCode firstModMapKey;
CARD8 nModMapKeys;
KeyCode firstVModMapKey;
CARD8 nVModMapKeys;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xkbGetMapReq;
#define sz_xkbGetMapReq 28
typedef struct _xkbGetMapReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 pad1 B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 pad1;
KeyCode minKeyCode;
KeyCode maxKeyCode;
- CARD16 present B16;
+ CARD16 present;
CARD8 firstType;
CARD8 nTypes;
CARD8 totalTypes;
KeyCode firstKeySym;
- CARD16 totalSyms B16;
+ CARD16 totalSyms;
CARD8 nKeySyms;
KeyCode firstKeyAct;
- CARD16 totalActs B16;
+ CARD16 totalActs;
CARD8 nKeyActs;
KeyCode firstKeyBehavior;
CARD8 nKeyBehaviors;
@@ -349,7 +349,7 @@ typedef struct _xkbGetMapReply {
CARD8 nVModMapKeys;
CARD8 totalVModMapKeys;
CARD8 pad2;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
} xkbGetMapReply;
#define sz_xkbGetMapReply 40
@@ -360,20 +360,20 @@ typedef struct _xkbGetMapReply {
typedef struct _xkbSetMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 present B16;
- CARD16 flags B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 present;
+ CARD16 flags;
KeyCode minKeyCode;
KeyCode maxKeyCode;
CARD8 firstType;
CARD8 nTypes;
KeyCode firstKeySym;
CARD8 nKeySyms;
- CARD16 totalSyms B16;
+ CARD16 totalSyms;
KeyCode firstKeyAct;
CARD8 nKeyActs;
- CARD16 totalActs B16;
+ CARD16 totalActs;
KeyCode firstKeyBehavior;
CARD8 nKeyBehaviors;
CARD8 totalKeyBehaviors;
@@ -386,12 +386,12 @@ typedef struct _xkbSetMap {
KeyCode firstVModMapKey;
CARD8 nVModMapKeys;
CARD8 totalVModMapKeys;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
} xkbSetMapReq;
#define sz_xkbSetMapReq 36
typedef struct _xkbSymInterpretWireDesc {
- CARD32 sym B32;
+ CARD32 sym;
CARD8 mods;
CARD8 match;
CARD8 virtualMod;
@@ -403,93 +403,93 @@ typedef struct _xkbSymInterpretWireDesc {
typedef struct _xkbGetCompatMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetCompatMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 groups;
BOOL getAllSI;
- CARD16 firstSI B16;
- CARD16 nSI B16;
+ CARD16 firstSI;
+ CARD16 nSI;
} xkbGetCompatMapReq;
#define sz_xkbGetCompatMapReq 12
typedef struct _xkbGetCompatMapReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 groups;
CARD8 pad1;
- CARD16 firstSI B16;
- CARD16 nSI B16;
- CARD16 nTotalSI B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 firstSI;
+ CARD16 nSI;
+ CARD16 nTotalSI;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xkbGetCompatMapReply;
#define sz_xkbGetCompatMapReply 32
typedef struct _xkbSetCompatMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetCompatMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 pad1;
BOOL recomputeActions;
BOOL truncateSI;
CARD8 groups;
- CARD16 firstSI B16;
- CARD16 nSI B16;
- CARD16 pad2 B16;
+ CARD16 firstSI;
+ CARD16 nSI;
+ CARD16 pad2;
} xkbSetCompatMapReq;
#define sz_xkbSetCompatMapReq 16
typedef struct _xkbGetIndicatorState {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetIndicatorState */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad1 B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad1;
} xkbGetIndicatorStateReq;
#define sz_xkbGetIndicatorStateReq 8
typedef struct _xkbGetIndicatorStateReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 state B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 state;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xkbGetIndicatorStateReply;
#define sz_xkbGetIndicatorStateReply 32
typedef struct _xkbGetIndicatorMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetIndicatorMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad B16;
- CARD32 which B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad;
+ CARD32 which;
} xkbGetIndicatorMapReq;
#define sz_xkbGetIndicatorMapReq 12
typedef struct _xkbGetIndicatorMapReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 which B32;
- CARD32 realIndicators B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 which;
+ CARD32 realIndicators;
CARD8 nIndicators;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xkbGetIndicatorMapReply;
#define sz_xkbGetIndicatorMapReply 32
@@ -500,39 +500,39 @@ typedef struct _xkbIndicatorMapWireDesc {
CARD8 whichMods;
CARD8 mods;
CARD8 realMods;
- CARD16 virtualMods B16;
- CARD32 ctrls B32;
+ CARD16 virtualMods;
+ CARD32 ctrls;
} xkbIndicatorMapWireDesc;
#define sz_xkbIndicatorMapWireDesc 12
typedef struct _xkbSetIndicatorMap {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetIndicatorMap */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad1 B16;
- CARD32 which B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad1;
+ CARD32 which;
} xkbSetIndicatorMapReq;
#define sz_xkbSetIndicatorMapReq 12
typedef struct _xkbGetNamedIndicator {
CARD8 reqType;
CARD8 xkbReqType; /* X_KBGetNamedIndicator */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 ledClass B16;
- CARD16 ledID B16;
- CARD16 pad1 B16;
- Atom indicator B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 ledClass;
+ CARD16 ledID;
+ CARD16 pad1;
+ Atom indicator;
} xkbGetNamedIndicatorReq;
#define sz_xkbGetNamedIndicatorReq 16
typedef struct _xkbGetNamedIndicatorReply {
BYTE type;
BYTE deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom indicator B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom indicator;
BOOL found;
BOOL on;
BOOL realIndicator;
@@ -543,23 +543,23 @@ typedef struct _xkbGetNamedIndicatorReply {
CARD8 whichMods;
CARD8 mods;
CARD8 realMods;
- CARD16 virtualMods B16;
- CARD32 ctrls B32;
+ CARD16 virtualMods;
+ CARD32 ctrls;
BOOL supported;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xkbGetNamedIndicatorReply;
#define sz_xkbGetNamedIndicatorReply 32
typedef struct _xkbSetNamedIndicator {
CARD8 reqType;
CARD8 xkbReqType; /* X_KBSetNamedIndicator */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 ledClass B16;
- CARD16 ledID B16;
- CARD16 pad1 B16;
- Atom indicator B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 ledClass;
+ CARD16 ledID;
+ CARD16 pad1;
+ Atom indicator;
BOOL setState;
BOOL on;
BOOL setMap;
@@ -570,79 +570,79 @@ typedef struct _xkbSetNamedIndicator {
CARD8 groups;
CARD8 whichMods;
CARD8 realMods;
- CARD16 virtualMods B16;
- CARD32 ctrls B32;
+ CARD16 virtualMods;
+ CARD32 ctrls;
} xkbSetNamedIndicatorReq;
#define sz_xkbSetNamedIndicatorReq 32
typedef struct _xkbGetNames {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetNames */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad B16;
- CARD32 which B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad;
+ CARD32 which;
} xkbGetNamesReq;
#define sz_xkbGetNamesReq 12
typedef struct _xkbGetNamesReply {
BYTE type;
BYTE deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 which B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 which;
KeyCode minKeyCode;
KeyCode maxKeyCode;
CARD8 nTypes;
CARD8 groupNames;
- CARD16 virtualMods B16;
+ CARD16 virtualMods;
KeyCode firstKey;
CARD8 nKeys;
- CARD32 indicators B32;
+ CARD32 indicators;
CARD8 nRadioGroups;
CARD8 nKeyAliases;
- CARD16 nKTLevels B16;
- CARD32 pad3 B32;
+ CARD16 nKTLevels;
+ CARD32 pad3;
} xkbGetNamesReply;
#define sz_xkbGetNamesReply 32
typedef struct _xkbSetNames {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetNames */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 virtualMods B16;
- CARD32 which B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 virtualMods;
+ CARD32 which;
CARD8 firstType;
CARD8 nTypes;
CARD8 firstKTLevel;
CARD8 nKTLevels;
- CARD32 indicators B32;
+ CARD32 indicators;
CARD8 groupNames;
CARD8 nRadioGroups;
KeyCode firstKey;
CARD8 nKeys;
CARD8 nKeyAliases;
CARD8 pad1;
- CARD16 totalKTLevelNames B16;
+ CARD16 totalKTLevelNames;
} xkbSetNamesReq;
#define sz_xkbSetNamesReq 28
typedef struct _xkbPointWireDesc {
- INT16 x B16;
- INT16 y B16;
+ INT16 x;
+ INT16 y;
} xkbPointWireDesc;
#define sz_xkbPointWireDesc 4
typedef struct _xkbOutlineWireDesc {
CARD8 nPoints;
CARD8 cornerRadius;
- CARD16 pad B16;
+ CARD16 pad;
} xkbOutlineWireDesc;
#define sz_xkbOutlineWireDesc 4
typedef struct _xkbShapeWireDesc {
- Atom name B32;
+ Atom name;
CARD8 nOutlines;
CARD8 primaryNdx;
CARD8 approxNdx;
@@ -651,49 +651,49 @@ typedef struct _xkbShapeWireDesc {
#define sz_xkbShapeWireDesc 8
typedef struct _xkbSectionWireDesc {
- Atom name B32;
- INT16 top B16;
- INT16 left B16;
- CARD16 width B16;
- CARD16 height B16;
- INT16 angle B16;
+ Atom name;
+ INT16 top;
+ INT16 left;
+ CARD16 width;
+ CARD16 height;
+ INT16 angle;
CARD8 priority;
CARD8 nRows;
CARD8 nDoodads;
CARD8 nOverlays;
- CARD16 pad B16;
+ CARD16 pad;
} xkbSectionWireDesc;
#define sz_xkbSectionWireDesc 20
typedef struct _xkbRowWireDesc {
- INT16 top B16;
- INT16 left B16;
+ INT16 top;
+ INT16 left;
CARD8 nKeys;
BOOL vertical;
- CARD16 pad B16;
+ CARD16 pad;
} xkbRowWireDesc;
#define sz_xkbRowWireDesc 8
typedef struct _xkbKeyWireDesc {
CARD8 name[XkbKeyNameLength];
- INT16 gap B16;
+ INT16 gap;
CARD8 shapeNdx;
CARD8 colorNdx;
} xkbKeyWireDesc;
#define sz_xkbKeyWireDesc 8
typedef struct _xkbOverlayWireDesc {
- Atom name B32;
+ Atom name;
CARD8 nRows;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xkbOverlayWireDesc;
#define sz_xkbOverlayWireDesc 8
typedef struct _xkbOverlayRowWireDesc {
CARD8 rowUnder;
CARD8 nKeys;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xkbOverlayRowWireDesc;
#define sz_xkbOverlayRowWireDesc 4
@@ -704,72 +704,72 @@ typedef struct _xkbOverlayKeyWireDesc {
#define sz_xkbOverlayKeyWireDesc 8
typedef struct _xkbShapeDoodadWireDesc {
- Atom name B32;
+ Atom name;
CARD8 type;
CARD8 priority;
- INT16 top B16;
- INT16 left B16;
- INT16 angle B16;
+ INT16 top;
+ INT16 left;
+ INT16 angle;
CARD8 colorNdx;
CARD8 shapeNdx;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
+ CARD16 pad1;
+ CARD32 pad2;
} xkbShapeDoodadWireDesc;
#define sz_xkbShapeDoodadWireDesc 20
typedef struct _xkbTextDoodadWireDesc {
- Atom name B32;
+ Atom name;
CARD8 type;
CARD8 priority;
- INT16 top B16;
- INT16 left B16;
- INT16 angle B16;
- CARD16 width B16;
- CARD16 height B16;
+ INT16 top;
+ INT16 left;
+ INT16 angle;
+ CARD16 width;
+ CARD16 height;
CARD8 colorNdx;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xkbTextDoodadWireDesc;
#define sz_xkbTextDoodadWireDesc 20
typedef struct _xkbIndicatorDoodadWireDesc {
- Atom name B32;
+ Atom name;
CARD8 type;
CARD8 priority;
- INT16 top B16;
- INT16 left B16;
- INT16 angle B16;
+ INT16 top;
+ INT16 left;
+ INT16 angle;
CARD8 shapeNdx;
CARD8 onColorNdx;
CARD8 offColorNdx;
CARD8 pad1;
- CARD32 pad2 B32;
+ CARD32 pad2;
} xkbIndicatorDoodadWireDesc;
#define sz_xkbIndicatorDoodadWireDesc 20
typedef struct _xkbLogoDoodadWireDesc {
- Atom name B32;
+ Atom name;
CARD8 type;
CARD8 priority;
- INT16 top B16;
- INT16 left B16;
- INT16 angle B16;
+ INT16 top;
+ INT16 left;
+ INT16 angle;
CARD8 colorNdx;
CARD8 shapeNdx;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
+ CARD16 pad1;
+ CARD32 pad2;
} xkbLogoDoodadWireDesc;
#define sz_xkbLogoDoodadWireDesc 20
typedef struct _xkbAnyDoodadWireDesc {
- Atom name B32;
+ Atom name;
CARD8 type;
CARD8 priority;
- INT16 top B16;
- INT16 left B16;
- INT16 angle B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ INT16 top;
+ INT16 left;
+ INT16 angle;
+ CARD32 pad2;
+ CARD32 pad3;
} xkbAnyDoodadWireDesc;
#define sz_xkbAnyDoodadWireDesc 20
@@ -785,29 +785,29 @@ typedef union _xkbDoodadWireDesc {
typedef struct _xkbGetGeometry {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetGeometry */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad B16;
- Atom name B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad;
+ Atom name;
} xkbGetGeometryReq;
#define sz_xkbGetGeometryReq 12
typedef struct _xkbGetGeometryReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom name B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom name;
BOOL found;
CARD8 pad;
- CARD16 widthMM B16;
- CARD16 heightMM B16;
- CARD16 nProperties B16;
- CARD16 nColors B16;
- CARD16 nShapes B16;
- CARD16 nSections B16;
- CARD16 nDoodads B16;
- CARD16 nKeyAliases B16;
+ CARD16 widthMM;
+ CARD16 heightMM;
+ CARD16 nProperties;
+ CARD16 nColors;
+ CARD16 nShapes;
+ CARD16 nSections;
+ CARD16 nDoodads;
+ CARD16 nKeyAliases;
CARD8 baseColorNdx;
CARD8 labelColorNdx;
} xkbGetGeometryReply;
@@ -816,85 +816,85 @@ typedef struct _xkbGetGeometryReply {
typedef struct _xkbSetGeometry {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetGeometry */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 nShapes;
CARD8 nSections;
- Atom name B32;
- CARD16 widthMM B16;
- CARD16 heightMM B16;
- CARD16 nProperties B16;
- CARD16 nColors B16;
- CARD16 nDoodads B16;
- CARD16 nKeyAliases B16;
+ Atom name;
+ CARD16 widthMM;
+ CARD16 heightMM;
+ CARD16 nProperties;
+ CARD16 nColors;
+ CARD16 nDoodads;
+ CARD16 nKeyAliases;
CARD8 baseColorNdx;
CARD8 labelColorNdx;
- CARD16 pad B16;
+ CARD16 pad;
} xkbSetGeometryReq;
#define sz_xkbSetGeometryReq 28
typedef struct _xkbPerClientFlags {
CARD8 reqType;
CARD8 xkbReqType;/* always X_KBPerClientFlags */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 pad1 B16;
- CARD32 change B32;
- CARD32 value B32;
- CARD32 ctrlsToChange B32;
- CARD32 autoCtrls B32;
- CARD32 autoCtrlValues B32;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 pad1;
+ CARD32 change;
+ CARD32 value;
+ CARD32 ctrlsToChange;
+ CARD32 autoCtrls;
+ CARD32 autoCtrlValues;
} xkbPerClientFlagsReq;
#define sz_xkbPerClientFlagsReq 28
typedef struct _xkbPerClientFlagsReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 supported B32;
- CARD32 value B32;
- CARD32 autoCtrls B32;
- CARD32 autoCtrlValues B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 supported;
+ CARD32 value;
+ CARD32 autoCtrls;
+ CARD32 autoCtrlValues;
+ CARD32 pad1;
+ CARD32 pad2;
} xkbPerClientFlagsReply;
#define sz_xkbPerClientFlagsReply 32
typedef struct _xkbListComponents {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBListComponents */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 maxNames B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 maxNames;
} xkbListComponentsReq;
#define sz_xkbListComponentsReq 8
typedef struct _xkbListComponentsReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 nKeymaps B16;
- CARD16 nKeycodes B16;
- CARD16 nTypes B16;
- CARD16 nCompatMaps B16;
- CARD16 nSymbols B16;
- CARD16 nGeometries B16;
- CARD16 extra B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 nKeymaps;
+ CARD16 nKeycodes;
+ CARD16 nTypes;
+ CARD16 nCompatMaps;
+ CARD16 nSymbols;
+ CARD16 nGeometries;
+ CARD16 extra;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xkbListComponentsReply;
#define sz_xkbListComponentsReply 32
typedef struct _xkbGetKbdByName {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetKbdByName */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 need B16; /* combination of XkbGBN_* */
- CARD16 want B16; /* combination of XkbGBN_* */
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 need; /* combination of XkbGBN_* */
+ CARD16 want; /* combination of XkbGBN_* */
BOOL load;
CARD8 pad;
} xkbGetKbdByNameReq;
@@ -903,104 +903,104 @@ typedef struct _xkbGetKbdByName {
typedef struct _xkbGetKbdByNameReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
KeyCode minKeyCode;
KeyCode maxKeyCode;
BOOL loaded;
BOOL newKeyboard;
- CARD16 found B16; /* combination of XkbGBN_* */
- CARD16 reported B16; /* combination of XkbAllComponents */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 found; /* combination of XkbGBN_* */
+ CARD16 reported; /* combination of XkbAllComponents */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xkbGetKbdByNameReply;
#define sz_xkbGetKbdByNameReply 32
typedef struct _xkbDeviceLedsWireDesc {
- CARD16 ledClass B16;
- CARD16 ledID B16;
- CARD32 namesPresent B32;
- CARD32 mapsPresent B32;
- CARD32 physIndicators B32;
- CARD32 state B32;
+ CARD16 ledClass;
+ CARD16 ledID;
+ CARD32 namesPresent;
+ CARD32 mapsPresent;
+ CARD32 physIndicators;
+ CARD32 state;
} xkbDeviceLedsWireDesc;
#define sz_xkbDeviceLedsWireDesc 20
typedef struct _xkbGetDeviceInfo {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBGetDeviceInfo */
- CARD16 length B16;
- CARD16 deviceSpec B16;
- CARD16 wanted B16;
+ CARD16 length;
+ CARD16 deviceSpec;
+ CARD16 wanted;
BOOL allBtns;
CARD8 firstBtn;
CARD8 nBtns;
CARD8 pad;
- CARD16 ledClass B16;
- CARD16 ledID B16;
+ CARD16 ledClass;
+ CARD16 ledID;
} xkbGetDeviceInfoReq;
#define sz_xkbGetDeviceInfoReq 16
typedef struct _xkbGetDeviceInfoReply {
CARD8 type; /* always X_Reply */
CARD8 deviceID;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 present B16;
- CARD16 supported B16;
- CARD16 unsupported B16;
- CARD16 nDeviceLedFBs B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 present;
+ CARD16 supported;
+ CARD16 unsupported;
+ CARD16 nDeviceLedFBs;
CARD8 firstBtnWanted;
CARD8 nBtnsWanted;
CARD8 firstBtnRtrn;
CARD8 nBtnsRtrn;
CARD8 totalBtns;
BOOL hasOwnState;
- CARD16 dfltKbdFB B16;
- CARD16 dfltLedFB B16;
- CARD16 pad B16;
- Atom devType B32;
+ CARD16 dfltKbdFB;
+ CARD16 dfltLedFB;
+ CARD16 pad;
+ Atom devType;
} xkbGetDeviceInfoReply;
#define sz_xkbGetDeviceInfoReply 32
typedef struct _xkbSetDeviceInfo {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetDeviceInfo */
- CARD16 length B16;
- CARD16 deviceSpec B16;
+ CARD16 length;
+ CARD16 deviceSpec;
CARD8 firstBtn;
CARD8 nBtns;
- CARD16 change B16;
- CARD16 nDeviceLedFBs B16;
+ CARD16 change;
+ CARD16 nDeviceLedFBs;
} xkbSetDeviceInfoReq;
#define sz_xkbSetDeviceInfoReq 12
typedef struct _xkbSetDebuggingFlags {
CARD8 reqType;
CARD8 xkbReqType; /* always X_KBSetDebuggingFlags */
- CARD16 length B16;
- CARD16 msgLength B16;
- CARD16 pad B16;
- CARD32 affectFlags B32;
- CARD32 flags B32;
- CARD32 affectCtrls B32;
- CARD32 ctrls B32;
+ CARD16 length;
+ CARD16 msgLength;
+ CARD16 pad;
+ CARD32 affectFlags;
+ CARD32 flags;
+ CARD32 affectCtrls;
+ CARD32 ctrls;
} xkbSetDebuggingFlagsReq;
#define sz_xkbSetDebuggingFlagsReq 24
typedef struct _xkbSetDebuggingFlagsReply {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 currentFlags B32;
- CARD32 currentCtrls B32;
- CARD32 supportedFlags B32;
- CARD32 supportedCtrls B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 currentFlags;
+ CARD32 currentCtrls;
+ CARD32 supportedFlags;
+ CARD32 supportedCtrls;
+ CARD32 pad1;
+ CARD32 pad2;
} xkbSetDebuggingFlagsReply;
#define sz_xkbSetDebuggingFlagsReply 32
@@ -1011,24 +1011,24 @@ typedef struct _xkbSetDebuggingFlagsReply {
typedef struct _xkbAnyEvent {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xkbAnyEvent;
#define sz_xkbAnyEvent 32
typedef struct _xkbNewKeyboardNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 oldDeviceID;
KeyCode minKeyCode;
@@ -1037,23 +1037,23 @@ typedef struct _xkbNewKeyboardNotify {
KeyCode oldMaxKeyCode;
CARD8 requestMajor;
CARD8 requestMinor;
- CARD16 changed B16;
+ CARD16 changed;
CARD8 detail;
CARD8 pad1;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xkbNewKeyboardNotify;
#define sz_xkbNewKeyboardNotify 32
typedef struct _xkbMapNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 ptrBtnActions;
- CARD16 changed B16;
+ CARD16 changed;
KeyCode minKeyCode;
KeyCode maxKeyCode;
CARD8 firstType;
@@ -1070,32 +1070,32 @@ typedef struct _xkbMapNotify {
CARD8 nModMapKeys;
KeyCode firstVModMapKey;
CARD8 nVModMapKeys;
- CARD16 virtualMods B16;
- CARD16 pad1 B16;
+ CARD16 virtualMods;
+ CARD16 pad1;
} xkbMapNotify;
#define sz_xkbMapNotify 32
typedef struct _xkbStateNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 mods;
CARD8 baseMods;
CARD8 latchedMods;
CARD8 lockedMods;
CARD8 group;
- INT16 baseGroup B16;
- INT16 latchedGroup B16;
+ INT16 baseGroup;
+ INT16 latchedGroup;
CARD8 lockedGroup;
CARD8 compatState;
CARD8 grabMods;
CARD8 compatGrabMods;
CARD8 lookupMods;
CARD8 compatLookupMods;
- CARD16 ptrBtnState B16;
- CARD16 changed B16;
+ CARD16 ptrBtnState;
+ CARD16 changed;
KeyCode keycode;
CARD8 eventType;
CARD8 requestMajor;
@@ -1106,46 +1106,46 @@ typedef struct _xkbStateNotify {
typedef struct _xkbControlsNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 numGroups;
- CARD16 pad1 B16;
- CARD32 changedControls B32;
- CARD32 enabledControls B32;
- CARD32 enabledControlChanges B32;
+ CARD16 pad1;
+ CARD32 changedControls;
+ CARD32 enabledControls;
+ CARD32 enabledControlChanges;
KeyCode keycode;
CARD8 eventType;
CARD8 requestMajor;
CARD8 requestMinor;
- CARD32 pad2 B32;
+ CARD32 pad2;
} xkbControlsNotify;
#define sz_xkbControlsNotify 32
typedef struct _xkbIndicatorNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 state B32;
- CARD32 changed B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad2;
+ CARD32 state;
+ CARD32 changed;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xkbIndicatorNotify;
#define sz_xkbIndicatorNotify 32
typedef struct _xkbNamesNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 pad1;
- CARD16 changed B16;
+ CARD16 changed;
CARD8 firstType;
CARD8 nTypes;
CARD8 firstLevelName;
@@ -1154,56 +1154,56 @@ typedef struct _xkbNamesNotify {
CARD8 nRadioGroups;
CARD8 nAliases;
CARD8 changedGroupNames;
- CARD16 changedVirtualMods B16;
+ CARD16 changedVirtualMods;
CARD8 firstKey;
CARD8 nKeys;
- CARD32 changedIndicators B32;
- CARD32 pad3 B32;
+ CARD32 changedIndicators;
+ CARD32 pad3;
} xkbNamesNotify;
#define sz_xkbNamesNotify 32
typedef struct _xkbCompatMapNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 changedGroups;
- CARD16 firstSI B16;
- CARD16 nSI B16;
- CARD16 nTotalSI B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 firstSI;
+ CARD16 nSI;
+ CARD16 nTotalSI;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xkbCompatMapNotify;
#define sz_xkbCompatMapNotify 32
typedef struct _xkbBellNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 bellClass;
CARD8 bellID;
CARD8 percent;
- CARD16 pitch B16;
- CARD16 duration B16;
- Atom name B32;
- Window window B32;
+ CARD16 pitch;
+ CARD16 duration;
+ Atom name;
+ Window window;
BOOL eventOnly;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
+ CARD16 pad2;
+ CARD32 pad3;
} xkbBellNotify;
#define sz_xkbBellNotify 32
typedef struct _xkbActionMessage {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
KeyCode keycode;
BOOL press;
@@ -1211,46 +1211,46 @@ typedef struct _xkbActionMessage {
CARD8 mods;
CARD8 group;
CARD8 message[8];
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xkbActionMessage;
#define sz_xkbActionMessage 32
typedef struct _xkbAccessXNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
KeyCode keycode;
- CARD16 detail B16;
- CARD16 slowKeysDelay B16;
- CARD16 debounceDelay B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 detail;
+ CARD16 slowKeysDelay;
+ CARD16 debounceDelay;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xkbAccessXNotify;
#define sz_xkbAccessXNotify 32
typedef struct _xkbExtensionDeviceNotify {
BYTE type;
BYTE xkbType;
- CARD16 sequenceNumber B16;
- Time time B32;
+ CARD16 sequenceNumber;
+ Time time;
CARD8 deviceID;
CARD8 pad1;
- CARD16 reason B16;
- CARD16 ledClass B16;
- CARD16 ledID B16;
- CARD32 ledsDefined B32;
- CARD32 ledState B32;
+ CARD16 reason;
+ CARD16 ledClass;
+ CARD16 ledID;
+ CARD32 ledsDefined;
+ CARD32 ledState;
CARD8 firstBtn;
CARD8 nBtns;
- CARD16 supported B16;
- CARD16 unsupported B16;
- CARD16 pad3 B16;
+ CARD16 supported;
+ CARD16 unsupported;
+ CARD16 pad3;
} xkbExtensionDeviceNotify;
#define sz_xkbExtensionDeviceNotify 32
diff --git a/include/X11/extensions/XResproto.h b/include/X11/extensions/XResproto.h
index 13b5cdb..74cc876 100644
--- a/include/X11/extensions/XResproto.h
+++ b/include/X11/extensions/XResproto.h
@@ -41,25 +41,25 @@ typedef struct {
typedef struct _XResQueryVersion {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 client_major;
CARD8 client_minor;
- CARD16 unused B16;
+ CARD16 unused;
} xXResQueryVersionReq;
#define sz_xXResQueryVersionReq 8
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 server_major B16;
- CARD16 server_minor B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 server_major;
+ CARD16 server_minor;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXResQueryVersionReply;
#define sz_xXResQueryVersionReply 32
@@ -68,21 +68,21 @@ typedef struct {
typedef struct _XResQueryClients {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
+ CARD16 length;
} xXResQueryClientsReq;
#define sz_xXResQueryClientsReq 4
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_clients B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_clients;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXResQueryClientsReply;
#define sz_xXResQueryClientsReply 32
@@ -91,22 +91,22 @@ typedef struct {
typedef struct _XResQueryClientResources {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
- CARD32 xid B32;
+ CARD16 length;
+ CARD32 xid;
} xXResQueryClientResourcesReq;
#define sz_xXResQueryClientResourcesReq 8
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_types B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_types;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXResQueryClientResourcesReply;
#define sz_xXResQueryClientResourcesReply 32
@@ -115,22 +115,22 @@ typedef struct {
typedef struct _XResQueryClientPixmapBytes {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
- CARD32 xid B32;
+ CARD16 length;
+ CARD32 xid;
} xXResQueryClientPixmapBytesReq;
#define sz_xXResQueryClientPixmapBytesReq 8
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 bytes B32;
- CARD32 bytes_overflow B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 bytes;
+ CARD32 bytes_overflow;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXResQueryClientPixmapBytesReply;
#define sz_xXResQueryClientPixmapBytesReply 32
@@ -140,14 +140,14 @@ typedef struct {
#define X_XResLocalClientPIDMask 0x02
typedef struct _XResClientIdSpec {
- CARD32 client B32;
- CARD32 mask B32;
+ CARD32 client;
+ CARD32 mask;
} xXResClientIdSpec;
#define sz_xXResClientIdSpec 8
typedef struct _XResClientIdValue {
xXResClientIdSpec spec;
- CARD32 length B32;
+ CARD32 length;
// followed by length CARD32s
} xXResClientIdValue;
#define sz_xResClientIdValue (sz_xXResClientIdSpec + 4)
@@ -155,8 +155,8 @@ typedef struct _XResClientIdValue {
typedef struct _XResQueryClientIds {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
- CARD32 numSpecs B32;
+ CARD16 length;
+ CARD32 numSpecs;
// followed by numSpecs times XResClientIdSpec
} xXResQueryClientIdsReq;
#define sz_xXResQueryClientIdsReq 8
@@ -164,14 +164,14 @@ typedef struct _XResQueryClientIds {
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numIds B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numIds;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
// followed by numIds times XResClientIdValue
} xXResQueryClientIdsReply;
#define sz_xXResQueryClientIdsReply 32
@@ -187,24 +187,24 @@ typedef struct _XResResourceIdSpec {
typedef struct _XResQueryResourceBytes {
CARD8 reqType;
CARD8 XResReqType;
- CARD16 length B16;
- CARD32 client B32;
- CARD32 numSpecs B32;
+ CARD16 length;
+ CARD32 client;
+ CARD32 numSpecs;
// followed by numSpecs times XResResourceIdSpec
} xXResQueryResourceBytesReq;
#define sz_xXResQueryResourceBytesReq 12
typedef struct _XResResourceSizeSpec {
xXResResourceIdSpec spec;
- CARD32 bytes B32;
- CARD32 refCount B32;
- CARD32 useCount B32;
+ CARD32 bytes;
+ CARD32 refCount;
+ CARD32 useCount;
} xXResResourceSizeSpec;
#define sz_xXResResourceSizeSpec (sz_xXResResourceIdSpec + 12)
typedef struct _XResResourceSizeValue {
xXResResourceSizeSpec size;
- CARD32 numCrossReferences B32;
+ CARD32 numCrossReferences;
// followed by numCrossReferences times XResResourceSizeSpec
} xXResResourceSizeValue;
#define sz_xXResResourceSizeValue (sz_xXResResourceSizeSpec + 4)
@@ -212,14 +212,14 @@ typedef struct _XResResourceSizeValue {
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numSizes B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numSizes;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
// followed by numSizes times XResResourceSizeValue
} xXResQueryResourceBytesReply;
#define sz_xXResQueryResourceBytesReply 32
diff --git a/include/X11/extensions/XvMCproto.h b/include/X11/extensions/XvMCproto.h
index 43ec688..2fa27b2 100644
--- a/include/X11/extensions/XvMCproto.h
+++ b/include/X11/extensions/XvMCproto.h
@@ -17,125 +17,125 @@
typedef struct {
- CARD32 surface_type_id B32;
- CARD16 chroma_format B16;
- CARD16 pad0 B16;
- CARD16 max_width B16;
- CARD16 max_height B16;
- CARD16 subpicture_max_width B16;
- CARD16 subpicture_max_height B16;
- CARD32 mc_type B32;
- CARD32 flags B32;
+ CARD32 surface_type_id;
+ CARD16 chroma_format;
+ CARD16 pad0;
+ CARD16 max_width;
+ CARD16 max_height;
+ CARD16 subpicture_max_width;
+ CARD16 subpicture_max_height;
+ CARD32 mc_type;
+ CARD32 flags;
} xvmcSurfaceInfo;
#define sz_xvmcSurfaceInfo 24;
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
+ CARD16 length;
} xvmcQueryVersionReq;
#define sz_xvmcQueryVersionReq 4;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 major B32;
- CARD32 minor B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 major;
+ CARD32 minor;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
} xvmcQueryVersionReply;
#define sz_xvmcQueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 port B32;
+ CARD16 length;
+ CARD32 port;
} xvmcListSurfaceTypesReq;
#define sz_xvmcListSurfaceTypesReq 8;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num B32;
- CARD32 padl3 B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num;
+ CARD32 padl3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
} xvmcListSurfaceTypesReply;
#define sz_xvmcListSurfaceTypesReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 context_id B32;
- CARD32 port B32;
- CARD32 surface_type_id B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 flags B32;
+ CARD16 length;
+ CARD32 context_id;
+ CARD32 port;
+ CARD32 surface_type_id;
+ CARD16 width;
+ CARD16 height;
+ CARD32 flags;
} xvmcCreateContextReq;
#define sz_xvmcCreateContextReq 24;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 width_actual B16;
- CARD16 height_actual B16;
- CARD32 flags_return B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 width_actual;
+ CARD16 height_actual;
+ CARD32 flags_return;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
} xvmcCreateContextReply;
#define sz_xvmcCreateContextReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 context_id B32;
+ CARD16 length;
+ CARD32 context_id;
} xvmcDestroyContextReq;
#define sz_xvmcDestroyContextReq 8;
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 surface_id B32;
- CARD32 context_id B32;
+ CARD16 length;
+ CARD32 surface_id;
+ CARD32 context_id;
} xvmcCreateSurfaceReq;
#define sz_xvmcCreateSurfaceReq 12;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 padl2 B32;
- CARD32 padl3 B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 padl2;
+ CARD32 padl3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
} xvmcCreateSurfaceReply;
#define sz_xvmcCreateSurfaceReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 surface_id B32;
+ CARD16 length;
+ CARD32 surface_id;
} xvmcDestroySurfaceReq;
#define sz_xvmcDestroySurfaceReq 8;
@@ -143,83 +143,83 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 subpicture_id B32;
- CARD32 context_id B32;
- CARD32 xvimage_id B32;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ CARD32 subpicture_id;
+ CARD32 context_id;
+ CARD32 xvimage_id;
+ CARD16 width;
+ CARD16 height;
} xvmcCreateSubpictureReq;
#define sz_xvmcCreateSubpictureReq 20;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 width_actual B16;
- CARD16 height_actual B16;
- CARD16 num_palette_entries B16;
- CARD16 entry_bytes B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 width_actual;
+ CARD16 height_actual;
+ CARD16 num_palette_entries;
+ CARD16 entry_bytes;
CARD8 component_order[4];
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
} xvmcCreateSubpictureReply;
#define sz_xvmcCreateSubpictureReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 subpicture_id B32;
+ CARD16 length;
+ CARD32 subpicture_id;
} xvmcDestroySubpictureReq;
#define sz_xvmcDestroySubpictureReq 8;
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 port B32;
- CARD32 surface_type_id B32;
+ CARD16 length;
+ CARD32 port;
+ CARD32 surface_type_id;
} xvmcListSubpictureTypesReq;
#define sz_xvmcListSubpictureTypesReq 12;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num B32;
- CARD32 padl2 B32;
- CARD32 padl3 B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num;
+ CARD32 padl2;
+ CARD32 padl3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
} xvmcListSubpictureTypesReply;
#define sz_xvmcListSubpictureTypesReply 32
typedef struct {
CARD8 reqType;
CARD8 xvmcReqType;
- CARD16 length B16;
- CARD32 port B32;
- CARD32 shmKey B32;
- CARD32 magic B32;
+ CARD16 length;
+ CARD32 port;
+ CARD32 shmKey;
+ CARD32 magic;
} xvmcGetDRInfoReq;
#define sz_xvmcGetDRInfoReq 16;
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 major B32;
- CARD32 minor B32;
- CARD32 patchLevel B32;
- CARD32 nameLen B32;
- CARD32 busIDLen B32;
- CARD32 isLocal B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 major;
+ CARD32 minor;
+ CARD32 patchLevel;
+ CARD32 nameLen;
+ CARD32 busIDLen;
+ CARD32 isLocal;
} xvmcGetDRInfoReply;
#define sz_xvmcGetDRInfoReply 32
diff --git a/include/X11/extensions/Xvproto.h b/include/X11/extensions/Xvproto.h
index 94bd9cc..6e7ea08 100644
--- a/include/X11/extensions/Xvproto.h
+++ b/include/X11/extensions/Xvproto.h
@@ -65,79 +65,79 @@ SOFTWARE.
/* Structures */
typedef struct {
- INT32 numerator B32;
- INT32 denominator B32;
+ INT32 numerator;
+ INT32 denominator;
} xvRational;
#define sz_xvRational 8
typedef struct {
- XvPortID base_id B32;
- CARD16 name_size B16;
- CARD16 num_ports B16;
- CARD16 num_formats B16;
+ XvPortID base_id;
+ CARD16 name_size;
+ CARD16 num_ports;
+ CARD16 num_formats;
CARD8 type;
CARD8 pad;
} xvAdaptorInfo;
#define sz_xvAdaptorInfo 12
typedef struct {
- XvEncodingID encoding B32;
- CARD16 name_size B16;
- CARD16 width B16, height B16;
- CARD16 pad B16;
+ XvEncodingID encoding;
+ CARD16 name_size;
+ CARD16 width, height;
+ CARD16 pad;
xvRational rate;
} xvEncodingInfo;
#define sz_xvEncodingInfo (12 + sz_xvRational)
typedef struct {
- VisualID visual B32;
+ VisualID visual;
CARD8 depth;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xvFormat;
#define sz_xvFormat 8
typedef struct {
- CARD32 flags B32;
- INT32 min B32;
- INT32 max B32;
- CARD32 size B32;
+ CARD32 flags;
+ INT32 min;
+ INT32 max;
+ CARD32 size;
} xvAttributeInfo;
#define sz_xvAttributeInfo 16
typedef struct {
- CARD32 id B32;
+ CARD32 id;
CARD8 type;
CARD8 byte_order;
- CARD16 pad1 B16;
+ CARD16 pad1;
CARD8 guid[16];
CARD8 bpp;
CARD8 num_planes;
- CARD16 pad2 B16;
+ CARD16 pad2;
CARD8 depth;
CARD8 pad3;
- CARD16 pad4 B16;
- CARD32 red_mask B32;
- CARD32 green_mask B32;
- CARD32 blue_mask B32;
+ CARD16 pad4;
+ CARD32 red_mask;
+ CARD32 green_mask;
+ CARD32 blue_mask;
CARD8 format;
CARD8 pad5;
- CARD16 pad6 B16;
- CARD32 y_sample_bits B32;
- CARD32 u_sample_bits B32;
- CARD32 v_sample_bits B32;
- CARD32 horz_y_period B32;
- CARD32 horz_u_period B32;
- CARD32 horz_v_period B32;
- CARD32 vert_y_period B32;
- CARD32 vert_u_period B32;
- CARD32 vert_v_period B32;
+ CARD16 pad6;
+ CARD32 y_sample_bits;
+ CARD32 u_sample_bits;
+ CARD32 v_sample_bits;
+ CARD32 horz_y_period;
+ CARD32 horz_u_period;
+ CARD32 horz_v_period;
+ CARD32 vert_y_period;
+ CARD32 vert_u_period;
+ CARD32 vert_v_period;
CARD8 comp_order[32];
CARD8 scanline_order;
CARD8 pad7;
- CARD16 pad8 B16;
- CARD32 pad9 B32;
- CARD32 pad10 B32;
+ CARD16 pad8;
+ CARD32 pad9;
+ CARD32 pad10;
} xvImageFormatInfo;
#define sz_xvImageFormatInfo 128
@@ -171,121 +171,121 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
+ CARD16 length;
} xvQueryExtensionReq;
#define sz_xvQueryExtensionReq 4
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xvQueryAdaptorsReq;
#define sz_xvQueryAdaptorsReq 8
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- CARD32 port B32;
+ CARD16 length;
+ CARD32 port;
} xvQueryEncodingsReq;
#define sz_xvQueryEncodingsReq 8
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- INT16 vid_x B16;
- INT16 vid_y B16;
- CARD16 vid_w B16;
- CARD16 vid_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ INT16 vid_x;
+ INT16 vid_y;
+ CARD16 vid_w;
+ CARD16 vid_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
} xvPutVideoReq;
#define sz_xvPutVideoReq 32
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- INT16 vid_x B16;
- INT16 vid_y B16;
- CARD16 vid_w B16;
- CARD16 vid_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ INT16 vid_x;
+ INT16 vid_y;
+ CARD16 vid_w;
+ CARD16 vid_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
} xvPutStillReq;
#define sz_xvPutStillReq 32
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- INT16 vid_x B16;
- INT16 vid_y B16;
- CARD16 vid_w B16;
- CARD16 vid_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ INT16 vid_x;
+ INT16 vid_y;
+ CARD16 vid_w;
+ CARD16 vid_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
} xvGetVideoReq;
#define sz_xvGetVideoReq 32
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- INT16 vid_x B16;
- INT16 vid_y B16;
- CARD16 vid_w B16;
- CARD16 vid_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ INT16 vid_x;
+ INT16 vid_y;
+ CARD16 vid_w;
+ CARD16 vid_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
} xvGetStillReq;
#define sz_xvGetStillReq 32
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Time time B32;
+ CARD16 length;
+ XvPortID port;
+ Time time;
} xvGrabPortReq;
#define sz_xvGrabPortReq 12
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Time time B32;
+ CARD16 length;
+ XvPortID port;
+ Time time;
} xvUngrabPortReq;
#define sz_xvUngrabPortReq 12
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- Drawable drawable B32;
+ CARD16 length;
+ Drawable drawable;
BOOL onoff;
CARD8 pad1;
CARD16 pad2;
@@ -295,8 +295,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
+ CARD16 length;
+ XvPortID port;
BOOL onoff;
CARD8 pad1;
CARD16 pad2;
@@ -306,117 +306,117 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
} xvStopVideoReq;
#define sz_xvStopVideoReq 12
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Atom attribute B32;
- INT32 value B32;
+ CARD16 length;
+ XvPortID port;
+ Atom attribute;
+ INT32 value;
} xvSetPortAttributeReq;
#define sz_xvSetPortAttributeReq 16
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Atom attribute B32;
+ CARD16 length;
+ XvPortID port;
+ Atom attribute;
} xvGetPortAttributeReq;
#define sz_xvGetPortAttributeReq 12
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- CARD16 vid_w B16;
- CARD16 vid_h B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ CARD16 vid_w;
+ CARD16 vid_h;
+ CARD16 drw_w;
+ CARD16 drw_h;
CARD8 motion;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xvQueryBestSizeReq;
#define sz_xvQueryBestSizeReq 20
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
+ CARD16 length;
+ XvPortID port;
} xvQueryPortAttributesReq;
#define sz_xvQueryPortAttributesReq 8
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- CARD32 id B32;
- INT16 src_x B16;
- INT16 src_y B16;
- CARD16 src_w B16;
- CARD16 src_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ CARD32 id;
+ INT16 src_x;
+ INT16 src_y;
+ CARD16 src_w;
+ CARD16 src_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
+ CARD16 width;
+ CARD16 height;
} xvPutImageReq;
#define sz_xvPutImageReq 40
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- ShmSeg shmseg B32;
- CARD32 id B32;
- CARD32 offset B32;
- INT16 src_x B16;
- INT16 src_y B16;
- CARD16 src_w B16;
- CARD16 src_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ ShmSeg shmseg;
+ CARD32 id;
+ CARD32 offset;
+ INT16 src_x;
+ INT16 src_y;
+ CARD16 src_w;
+ CARD16 src_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
+ CARD16 width;
+ CARD16 height;
CARD8 send_event;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xvShmPutImageReq;
#define sz_xvShmPutImageReq 52
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- XvPortID port B32;
+ CARD16 length;
+ XvPortID port;
} xvListImageFormatsReq;
#define sz_xvListImageFormatsReq 8
typedef struct {
CARD8 reqType;
CARD8 xvReqType;
- CARD16 length B16;
- CARD32 port B32;
- CARD32 id B32;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ CARD32 port;
+ CARD32 id;
+ CARD16 width;
+ CARD16 height;
} xvQueryImageAttributesReq;
#define sz_xvQueryImageAttributesReq 16
@@ -426,131 +426,131 @@ typedef struct {
typedef struct _QueryExtensionReply {
BYTE type; /* X_Reply */
CARD8 padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 version B16;
- CARD16 revision B16;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 version;
+ CARD16 revision;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryExtensionReply;
#define sz_xvQueryExtensionReply 32
typedef struct _QueryAdaptorsReply {
BYTE type; /* X_Reply */
CARD8 padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 num_adaptors B16;
- CARD16 pads3 B16;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 num_adaptors;
+ CARD16 pads3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryAdaptorsReply;
#define sz_xvQueryAdaptorsReply 32
typedef struct _QueryEncodingsReply {
BYTE type; /* X_Reply */
CARD8 padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 num_encodings B16;
- CARD16 padl3 B16;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 num_encodings;
+ CARD16 padl3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryEncodingsReply;
#define sz_xvQueryEncodingsReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE result;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD32 padl3 B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD32 padl3;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvGrabPortReply;
#define sz_xvGrabPortReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- INT32 value B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ INT32 value;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvGetPortAttributeReply;
#define sz_xvGetPortAttributeReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD16 actual_width B16;
- CARD16 actual_height B16;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD16 actual_width;
+ CARD16 actual_height;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryBestSizeReply;
#define sz_xvQueryBestSizeReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD32 num_attributes B32;
- CARD32 text_size B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD32 num_attributes;
+ CARD32 text_size;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryPortAttributesReply;
#define sz_xvQueryPortAttributesReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_formats B32;
- CARD32 padl4 B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_formats;
+ CARD32 padl4;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvListImageFormatsReply;
#define sz_xvListImageFormatsReply 32
typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_planes B32;
- CARD32 data_size B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_planes;
+ CARD32 data_size;
+ CARD16 width;
+ CARD16 height;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} xvQueryImageAttributesReply;
#define sz_xvQueryImageAttributesReply 32
@@ -561,31 +561,31 @@ typedef struct {
struct {
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
} u;
struct {
BYTE type;
BYTE reason;
- CARD16 sequenceNumber B16;
- Time time B32;
- Drawable drawable B32;
- XvPortID port B32;
- CARD32 padl5 B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ Time time;
+ Drawable drawable;
+ XvPortID port;
+ CARD32 padl5;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} videoNotify;
struct {
BYTE type;
BYTE padb1;
- CARD16 sequenceNumber B16;
- Time time B32;
- XvPortID port B32;
- Atom attribute B32;
- INT32 value B32;
- CARD32 padl6 B32;
- CARD32 padl7 B32;
- CARD32 padl8 B32;
+ CARD16 sequenceNumber;
+ Time time;
+ XvPortID port;
+ Atom attribute;
+ INT32 value;
+ CARD32 padl6;
+ CARD32 padl7;
+ CARD32 padl8;
} portNotify;
} u;
} xvEvent;
diff --git a/include/X11/extensions/agproto.h b/include/X11/extensions/agproto.h
index 1086661..803099d 100644
--- a/include/X11/extensions/agproto.h
+++ b/include/X11/extensions/agproto.h
@@ -53,24 +53,24 @@ from The Open Group.
typedef struct _XagQueryVersion {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagQueryVersion */
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
+ CARD16 length;
+ CARD16 client_major_version;
+ CARD16 client_minor_version;
} xXagQueryVersionReq;
#define sz_xXagQueryVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD16 server_major_version;
+ CARD16 server_minor_version;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXagQueryVersionReply;
#define sz_xXagQueryVersionReply 32
@@ -86,81 +86,81 @@ typedef struct {
typedef struct _XagCreate {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagCreate */
- CARD16 length B16;
- XAppGroup app_group B32;
- CARD32 attrib_mask B32; /* LISTofVALUE follows */
+ CARD16 length;
+ XAppGroup app_group;
+ CARD32 attrib_mask; /* LISTofVALUE follows */
} xXagCreateReq;
#define sz_xXagCreateReq 12
typedef struct _XagDestroy {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagDestroy */
- CARD16 length B16;
- XAppGroup app_group B32;
+ CARD16 length;
+ XAppGroup app_group;
} xXagDestroyReq;
#define sz_xXagDestroyReq 8
typedef struct _XagGetAttr {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagGetAttr */
- CARD16 length B16;
- XAppGroup app_group B32;
+ CARD16 length;
+ XAppGroup app_group;
} xXagGetAttrReq;
#define sz_xXagGetAttrReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- Window default_root B32;
- VisualID root_visual B32;
- Colormap default_colormap B32;
- CARD32 black_pixel B32;
- CARD32 white_pixel B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ Window default_root;
+ VisualID root_visual;
+ Colormap default_colormap;
+ CARD32 black_pixel;
+ CARD32 white_pixel;
BOOL single_screen;
BOOL app_group_leader;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xXagGetAttrReply;
#define sz_xXagGetAttrReply 32
typedef struct _XagQuery {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagQuery */
- CARD16 length B16;
- CARD32 resource B32;
+ CARD16 length;
+ CARD32 resource;
} xXagQueryReq;
#define sz_xXagQueryReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- XAppGroup app_group B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ XAppGroup app_group;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXagQueryReply;
#define sz_xXagQueryReply 32
typedef struct _XagCreateAssoc {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagCreateAssoc */
- CARD16 length B16;
- Window window B32;
- CARD16 window_type B16;
- CARD16 system_window_len B16; /* LISTofCARD8 follows */
+ CARD16 length;
+ Window window;
+ CARD16 window_type;
+ CARD16 system_window_len; /* LISTofCARD8 follows */
} xXagCreateAssocReq;
#define sz_xXagCreateAssocReq 12
typedef struct _XagDestroyAssoc {
CARD8 reqType; /* always XagReqCode */
CARD8 xagReqType; /* always X_XagDestroyAssoc */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xXagDestroyAssocReq;
#define sz_xXagDestroyAssocReq 8
diff --git a/include/X11/extensions/applewmproto.h b/include/X11/extensions/applewmproto.h
index d8be4e6..9141736 100644
--- a/include/X11/extensions/applewmproto.h
+++ b/include/X11/extensions/applewmproto.h
@@ -74,76 +74,76 @@ restoring the definitions in X.h. */
typedef struct _AppleWMQueryVersion {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xAppleWMQueryVersionReq;
#define sz_xAppleWMQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of WM protocol */
- CARD16 minorVersion B16; /* minor version of WM protocol */
- CARD32 patchVersion B32; /* patch version of WM protocol */
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of WM protocol */
+ CARD16 minorVersion; /* minor version of WM protocol */
+ CARD32 patchVersion; /* patch version of WM protocol */
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xAppleWMQueryVersionReply;
#define sz_xAppleWMQueryVersionReply 32
typedef struct _AppleWMDisableUpdate {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMDisableUpdate */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xAppleWMDisableUpdateReq;
#define sz_xAppleWMDisableUpdateReq 8
typedef struct _AppleWMReenableUpdate {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMReenableUpdate */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xAppleWMReenableUpdateReq;
#define sz_xAppleWMReenableUpdateReq 8
typedef struct _AppleWMSelectInput {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSelectInput */
- CARD16 length B16;
- CARD32 mask B32;
+ CARD16 length;
+ CARD32 mask;
} xAppleWMSelectInputReq;
#define sz_xAppleWMSelectInputReq 8
typedef struct _AppleWMNotify {
BYTE type; /* always eventBase + event type */
BYTE kind;
- CARD16 sequenceNumber B16;
- Time time B32; /* time of change */
- CARD16 pad1 B16;
- CARD32 arg B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ Time time; /* time of change */
+ CARD16 pad1;
+ CARD32 arg;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xAppleWMNotifyEvent;
#define sz_xAppleWMNotifyEvent 32
typedef struct _AppleWMSetWindowMenu {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSetWindowMenu */
- CARD16 length B16;
- CARD16 nitems B16;
- CARD16 pad1 B16;
+ CARD16 length;
+ CARD16 nitems;
+ CARD16 pad1;
} xAppleWMSetWindowMenuReq;
#define sz_xAppleWMSetWindowMenuReq 8
typedef struct _AppleWMSetWindowMenuCheck {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSetWindowMenuCheck */
- CARD16 length B16;
+ CARD16 length;
CARD32 index;
} xAppleWMSetWindowMenuCheckReq;
#define sz_xAppleWMSetWindowMenuCheckReq 8
@@ -151,14 +151,14 @@ typedef struct _AppleWMSetWindowMenuCheck {
typedef struct _AppleWMSetFrontProcess {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSetFrontProcess */
- CARD16 length B16;
+ CARD16 length;
} xAppleWMSetFrontProcessReq;
#define sz_xAppleWMSetFrontProcessReq 4
typedef struct _AppleWMSetWindowLevel {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSetWindowLevel */
- CARD16 length B16;
+ CARD16 length;
CARD32 window;
CARD32 level;
} xAppleWMSetWindowLevelReq;
@@ -167,7 +167,7 @@ typedef struct _AppleWMSetWindowLevel {
typedef struct _AppleWMSendPSN {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSendPSN */
- CARD16 length B16;
+ CARD16 length;
CARD32 psn_hi;
CARD32 psn_lo;
} xAppleWMSendPSNReq;
@@ -176,7 +176,7 @@ typedef struct _AppleWMSendPSN {
typedef struct _AppleWMAttachTransient {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMAttachTransient */
- CARD16 length B16;
+ CARD16 length;
CARD32 child;
CARD32 parent;
} xAppleWMAttachTransientReq;
@@ -185,7 +185,7 @@ typedef struct _AppleWMAttachTransient {
typedef struct _AppleWMSetCanQuit {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMSetCanQuit */
- CARD16 length B16;
+ CARD16 length;
CARD32 state;
} xAppleWMSetCanQuitReq;
#define sz_xAppleWMSetCanQuitReq 8
@@ -193,86 +193,86 @@ typedef struct _AppleWMSetCanQuit {
typedef struct _AppleWMFrameGetRect {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMFrameGetRect */
- CARD16 length B16;
- CARD16 frame_class B16;
- CARD16 frame_rect B16;
- CARD16 ix B16;
- CARD16 iy B16;
- CARD16 iw B16;
- CARD16 ih B16;
- CARD16 ox B16;
- CARD16 oy B16;
- CARD16 ow B16;
- CARD16 oh B16;
+ CARD16 length;
+ CARD16 frame_class;
+ CARD16 frame_rect;
+ CARD16 ix;
+ CARD16 iy;
+ CARD16 iw;
+ CARD16 ih;
+ CARD16 ox;
+ CARD16 oy;
+ CARD16 ow;
+ CARD16 oh;
} xAppleWMFrameGetRectReq;
#define sz_xAppleWMFrameGetRectReq 24
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD16 w B16;
- CARD16 h B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 x;
+ CARD16 y;
+ CARD16 w;
+ CARD16 h;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xAppleWMFrameGetRectReply;
#define sz_xAppleWMFrameGetRectReply 32
typedef struct _AppleWMFrameHitTest {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMFrameHitTest */
- CARD16 length B16;
- CARD16 frame_class B16;
- CARD16 pad1 B16;
- CARD16 px B16;
- CARD16 py B16;
- CARD16 ix B16;
- CARD16 iy B16;
- CARD16 iw B16;
- CARD16 ih B16;
- CARD16 ox B16;
- CARD16 oy B16;
- CARD16 ow B16;
- CARD16 oh B16;
+ CARD16 length;
+ CARD16 frame_class;
+ CARD16 pad1;
+ CARD16 px;
+ CARD16 py;
+ CARD16 ix;
+ CARD16 iy;
+ CARD16 iw;
+ CARD16 ih;
+ CARD16 ox;
+ CARD16 oy;
+ CARD16 ow;
+ CARD16 oh;
} xAppleWMFrameHitTestReq;
#define sz_xAppleWMFrameHitTestReq 28
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 ret B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 ret;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xAppleWMFrameHitTestReply;
#define sz_xAppleWMFrameHitTestReply 32
typedef struct _AppleWMFrameDraw {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_AppleWMFrameDraw */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 window B32;
- CARD16 frame_class B16;
- CARD16 frame_attr B16;
- CARD16 ix B16;
- CARD16 iy B16;
- CARD16 iw B16;
- CARD16 ih B16;
- CARD16 ox B16;
- CARD16 oy B16;
- CARD16 ow B16;
- CARD16 oh B16;
- CARD32 title_length B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 window;
+ CARD16 frame_class;
+ CARD16 frame_attr;
+ CARD16 ix;
+ CARD16 iy;
+ CARD16 iw;
+ CARD16 ih;
+ CARD16 ox;
+ CARD16 oy;
+ CARD16 ow;
+ CARD16 oh;
+ CARD32 title_length;
} xAppleWMFrameDrawReq;
#define sz_xAppleWMFrameDrawReq 36
diff --git a/include/X11/extensions/bigreqsproto.h b/include/X11/extensions/bigreqsproto.h
index bd0f8e5..df96a76 100644
--- a/include/X11/extensions/bigreqsproto.h
+++ b/include/X11/extensions/bigreqsproto.h
@@ -38,21 +38,21 @@ in this Software without prior written authorization from The Open Group.
typedef struct {
CARD8 reqType; /* always XBigReqCode */
CARD8 brReqType; /* always X_BigReqEnable */
- CARD16 length B16;
+ CARD16 length;
} xBigReqEnableReq;
#define sz_xBigReqEnableReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 max_request_size B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 max_request_size;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xBigReqEnableReply;
#define sz_xBigReqEnableReply 32
@@ -60,8 +60,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 data;
- CARD16 zero B16;
- CARD32 length B32;
+ CARD16 zero;
+ CARD32 length;
} xBigReq;
#endif /* _BIGREQSPROTO_H_ */
diff --git a/include/X11/extensions/compositeproto.h b/include/X11/extensions/compositeproto.h
index c9ffb74..b63f9cc 100644
--- a/include/X11/extensions/compositeproto.h
+++ b/include/X11/extensions/compositeproto.h
@@ -58,9 +58,9 @@
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xCompositeQueryVersionReq;
#define sz_xCompositeQueryVersionReq 12
@@ -68,14 +68,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xCompositeQueryVersionReply;
#define sz_xCompositeQueryVersionReply 32
@@ -83,11 +83,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
CARD8 update;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xCompositeRedirectWindowReq;
#define sz_xCompositeRedirectWindowReq 12
@@ -95,11 +95,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
CARD8 update;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xCompositeRedirectSubwindowsReq;
#define sz_xCompositeRedirectSubwindowsReq 12
@@ -107,11 +107,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
CARD8 update;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xCompositeUnredirectWindowReq;
#define sz_xCompositeUnredirectWindowReq 12
@@ -119,11 +119,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
CARD8 update;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xCompositeUnredirectSubwindowsReq;
#define sz_xCompositeUnredirectSubwindowsReq 12
@@ -131,9 +131,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Region region B32;
- Window window B32;
+ CARD16 length;
+ Region region;
+ Window window;
} xCompositeCreateRegionFromBorderClipReq;
#define sz_xCompositeCreateRegionFromBorderClipReq 12
@@ -144,8 +144,8 @@ typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
CARD16 length;
- Window window B32;
- Pixmap pixmap B32;
+ Window window;
+ Pixmap pixmap;
} xCompositeNameWindowPixmapReq;
#define sz_xCompositeNameWindowPixmapReq 12
@@ -155,8 +155,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xCompositeGetOverlayWindowReq;
#define sz_xCompositeGetOverlayWindowReq sizeof(xCompositeGetOverlayWindowReq)
@@ -164,14 +164,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Window overlayWin B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Window overlayWin;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xCompositeGetOverlayWindowReply;
#define sz_xCompositeGetOverlayWindowReply sizeof(xCompositeGetOverlayWindowReply)
@@ -179,8 +179,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xCompositeReleaseOverlayWindowReq;
#define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq)
diff --git a/include/X11/extensions/cupproto.h b/include/X11/extensions/cupproto.h
index f61c9f0..a0c3d16 100644
--- a/include/X11/extensions/cupproto.h
+++ b/include/X11/extensions/cupproto.h
@@ -36,68 +36,68 @@ in this Software without prior written authorization from The Open Group.
typedef struct _XcupQueryVersion {
CARD8 reqType; /* always XcupReqCode */
CARD8 xcupReqType; /* always X_XcupQueryVersion */
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
+ CARD16 length;
+ CARD16 client_major_version;
+ CARD16 client_minor_version;
} xXcupQueryVersionReq;
#define sz_xXcupQueryVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD16 server_major_version;
+ CARD16 server_minor_version;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXcupQueryVersionReply;
#define sz_xXcupQueryVersionReply 32
typedef struct _XcupGetReservedColormapEntries {
CARD8 reqType; /* always XcupReqCode */
CARD8 xcupReqType; /* always X_XcupGetReservedColormapEntries */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXcupGetReservedColormapEntriesReq;
#define sz_xXcupGetReservedColormapEntriesReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXcupGetReservedColormapEntriesReply;
#define sz_xXcupGetReservedColormapEntriesReply 32
typedef struct _XcupStoreColors {
CARD8 reqType; /* always XcupReqCode */
CARD8 xcupReqType; /* always X_XcupStoreColors */
- CARD16 length B16;
- CARD32 cmap B32;
+ CARD16 length;
+ CARD32 cmap;
} xXcupStoreColorsReq;
#define sz_xXcupStoreColorsReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXcupStoreColorsReply;
#define sz_xXcupStoreColorsReply 32
diff --git a/include/X11/extensions/damageproto.h b/include/X11/extensions/damageproto.h
index 7497d74..bff6c18 100644
--- a/include/X11/extensions/damageproto.h
+++ b/include/X11/extensions/damageproto.h
@@ -49,7 +49,7 @@
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
+ CARD16 length;
} xDamageReq;
/*
@@ -59,9 +59,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xDamageQueryVersionReq;
#define sz_xDamageQueryVersionReq 12
@@ -69,14 +69,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDamageQueryVersionReply;
#define sz_xDamageQueryVersionReply 32
@@ -84,12 +84,12 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
- Damage damage B32;
- Drawable drawable B32;
+ CARD16 length;
+ Damage damage;
+ Drawable drawable;
CARD8 level;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xDamageCreateReq;
#define sz_xDamageCreateReq 16
@@ -97,8 +97,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
- Damage damage B32;
+ CARD16 length;
+ Damage damage;
} xDamageDestroyReq;
#define sz_xDamageDestroyReq 8
@@ -106,10 +106,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
- Damage damage B32;
- Region repair B32;
- Region parts B32;
+ CARD16 length;
+ Damage damage;
+ Region repair;
+ Region parts;
} xDamageSubtractReq;
#define sz_xDamageSubtractReq 16
@@ -117,9 +117,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
- CARD16 length B16;
- Drawable drawable B32;
- Region region B32;
+ CARD16 length;
+ Drawable drawable;
+ Region region;
} xDamageAddReq;
#define sz_xDamageAddReq 12
@@ -131,10 +131,10 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 level;
- CARD16 sequenceNumber B16;
- Drawable drawable B32;
- Damage damage B32;
- Time timestamp B32;
+ CARD16 sequenceNumber;
+ Drawable drawable;
+ Damage damage;
+ Time timestamp;
xRectangle area;
xRectangle geometry;
} xDamageNotifyEvent;
diff --git a/include/X11/extensions/dbeproto.h b/include/X11/extensions/dbeproto.h
index 784926e..d6f7123 100644
--- a/include/X11/extensions/dbeproto.h
+++ b/include/X11/extensions/dbeproto.h
@@ -54,32 +54,32 @@ typedef CARD32 xDbeBackBuffer;
typedef struct
{
- CARD32 window B32; /* window */
+ CARD32 window; /* window */
xDbeSwapAction swapAction; /* swap action */
CARD8 pad1; /* unused */
- CARD16 pad2 B16;
+ CARD16 pad2;
} xDbeSwapInfo;
typedef struct
{
- CARD32 visualID B32; /* associated visual */
+ CARD32 visualID; /* associated visual */
CARD8 depth; /* depth of visual */
CARD8 perfLevel; /* performance level hint */
- CARD16 pad1 B16;
+ CARD16 pad1;
} xDbeVisInfo;
#define sz_xDbeVisInfo 8
typedef struct
{
- CARD32 n B32; /* number of visual info items in list */
+ CARD32 n; /* number of visual info items in list */
} xDbeScreenVisInfo; /* followed by n xDbeVisInfo items */
typedef struct
{
- CARD32 window B32; /* window */
+ CARD32 window; /* window */
} xDbeBufferAttributes;
@@ -90,10 +90,10 @@ typedef struct
{
CARD8 reqType; /* major-opcode: always codes->major_opcode */
CARD8 dbeReqType; /* minor-opcode: always X_DbeGetVersion (0) */
- CARD16 length B16; /* request length: (2) */
+ CARD16 length; /* request length: (2) */
CARD8 majorVersion; /* client-major-version */
CARD8 minorVersion; /* client-minor-version */
- CARD16 unused B16; /* unused */
+ CARD16 unused; /* unused */
} xDbeGetVersionReq;
#define sz_xDbeGetVersionReq 8
@@ -102,16 +102,16 @@ typedef struct
{
BYTE type; /* Reply: X_Reply (1) */
CARD8 unused; /* unused */
- CARD16 sequenceNumber B16; /* sequence number */
- CARD32 length B32; /* reply length: (0) */
+ CARD16 sequenceNumber; /* sequence number */
+ CARD32 length; /* reply length: (0) */
CARD8 majorVersion; /* server-major-version */
CARD8 minorVersion; /* server-minor-version */
- CARD16 pad1 B16; /* unused */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 pad1; /* unused */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xDbeGetVersionReply;
#define sz_xDbeGetVersionReply 32
@@ -120,12 +120,12 @@ typedef struct
{
CARD8 reqType; /* major-opcode: codes->major_opcode */
CARD8 dbeReqType; /* X_DbeAllocateBackBufferName (1) */
- CARD16 length B16; /* request length: (4) */
- CARD32 window B32; /* window */
- xDbeBackBuffer buffer B32; /* back buffer name */
+ CARD16 length; /* request length: (4) */
+ CARD32 window; /* window */
+ xDbeBackBuffer buffer; /* back buffer name */
xDbeSwapAction swapAction; /* swap action hint */
CARD8 pad1; /* unused */
- CARD16 pad2 B16;
+ CARD16 pad2;
} xDbeAllocateBackBufferNameReq;
#define sz_xDbeAllocateBackBufferNameReq 16
@@ -134,8 +134,8 @@ typedef struct
{
CARD8 reqType; /* major-opcode: codes->major_opcode */
CARD8 dbeReqType; /* X_DbeDeallocateBackBufferName (2) */
- CARD16 length B16; /* request length: (2) */
- xDbeBackBuffer buffer B32; /* back buffer name */
+ CARD16 length; /* request length: (2) */
+ xDbeBackBuffer buffer; /* back buffer name */
} xDbeDeallocateBackBufferNameReq;
#define sz_xDbeDeallocateBackBufferNameReq 8
@@ -144,8 +144,8 @@ typedef struct
{
CARD8 reqType; /* major-opcode: always codes->major_opcode */
CARD8 dbeReqType; /* minor-opcode: always X_DbeSwapBuffers (3) */
- CARD16 length B16; /* request length: (2+2n) */
- CARD32 n B32; /* n, number of window/swap action pairs */
+ CARD16 length; /* request length: (2+2n) */
+ CARD32 n; /* n, number of window/swap action pairs */
} xDbeSwapBuffersReq; /* followed by n window/swap action pairs */
#define sz_xDbeSwapBuffersReq 8
@@ -154,7 +154,7 @@ typedef struct
{
CARD8 reqType; /* major-opcode: always codes->major_opcode */
CARD8 dbeReqType; /* minor-opcode: always X_DbeBeginIdom (4) */
- CARD16 length B16; /* request length: (1) */
+ CARD16 length; /* request length: (1) */
} xDbeBeginIdiomReq;
#define sz_xDbeBeginIdiomReq 4
@@ -163,7 +163,7 @@ typedef struct
{
CARD8 reqType; /* major-opcode: always codes->major_opcode */
CARD8 dbeReqType; /* minor-opcode: always X_DbeEndIdom (5) */
- CARD16 length B16; /* request length: (1) */
+ CARD16 length; /* request length: (1) */
} xDbeEndIdiomReq;
#define sz_xDbeEndIdiomReq 4
@@ -172,8 +172,8 @@ typedef struct
{
CARD8 reqType; /* always codes->major_opcode */
CARD8 dbeReqType; /* always X_DbeGetVisualInfo (6) */
- CARD16 length B16; /* request length: (2+n) */
- CARD32 n B32; /* n, number of drawables in list */
+ CARD16 length; /* request length: (2+n) */
+ CARD32 n; /* n, number of drawables in list */
} xDbeGetVisualInfoReq; /* followed by n drawables */
#define sz_xDbeGetVisualInfoReq 8
@@ -182,14 +182,14 @@ typedef struct
{
BYTE type; /* Reply: X_Reply (1) */
CARD8 unused; /* unused */
- CARD16 sequenceNumber B16; /* sequence number */
- CARD32 length B32; /* reply length */
+ CARD16 sequenceNumber; /* sequence number */
+ CARD32 length; /* reply length */
CARD32 m; /* m, number of visual infos in list */
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD32 pad1; /* unused */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDbeGetVisualInfoReply; /* followed by m visual infos */
#define sz_xDbeGetVisualInfoReply 32
@@ -198,8 +198,8 @@ typedef struct
{
CARD8 reqType; /* always codes->major_opcode */
CARD8 dbeReqType; /* X_DbeGetBackBufferAttributes (7) */
- CARD16 length B16; /* request length: (2) */
- xDbeBackBuffer buffer B32; /* back buffer name */
+ CARD16 length; /* request length: (2) */
+ xDbeBackBuffer buffer; /* back buffer name */
} xDbeGetBackBufferAttributesReq;
#define sz_xDbeGetBackBufferAttributesReq 8
@@ -208,14 +208,14 @@ typedef struct
{
BYTE type; /* Reply: X_Reply (1) */
CARD8 unused; /* unused */
- CARD16 sequenceNumber B16; /* sequence number */
- CARD32 length B32; /* reply length: (0) */
+ CARD16 sequenceNumber; /* sequence number */
+ CARD32 length; /* reply length: (0) */
CARD32 attributes; /* attributes */
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD32 pad1; /* unused */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDbeGetBackBufferAttributesReply;
#define sz_xDbeGetBackBufferAttributesReply 32
diff --git a/include/X11/extensions/dmxproto.h b/include/X11/extensions/dmxproto.h
index 4bb160e..c8bc862 100644
--- a/include/X11/extensions/dmxproto.h
+++ b/include/X11/extensions/dmxproto.h
@@ -74,7 +74,7 @@
typedef struct {
CARD8 reqType; /* dmxcode */
CARD8 dmxReqType; /* X_DMXQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xDMXQueryVersionReq;
#define sz_xDMXQueryVersionReq 4
@@ -82,14 +82,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 ununsed;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 patchVersion B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 patchVersion;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
} xDMXQueryVersionReply;
#define sz_xDMXQueryVersionReply 32
@@ -97,7 +97,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXSync */
- CARD16 length B16;
+ CARD16 length;
} xDMXSyncReq;
#define sz_xDMXSyncReq 4
@@ -105,14 +105,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXSyncReply;
#define sz_xDMXSyncReply 32
@@ -120,8 +120,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXForceWindowCreation */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xDMXForceWindowCreationReq;
#define sz_xDMXForceWindowCreationReq 8
@@ -129,14 +129,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXForceWindowCreationReply;
#define sz_xDMXForceWindowCreationReply 32
@@ -144,7 +144,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetScreenCount */
- CARD16 length B16;
+ CARD16 length;
} xDMXGetScreenCountReq;
#define sz_xDMXGetScreenCountReq 4
@@ -152,14 +152,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 screenCount B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 screenCount;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXGetScreenCountReply;
#define sz_xDMXGetScreenCountReply 32
@@ -167,8 +167,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetScreenAttributes */
- CARD16 length B16;
- CARD32 physicalScreen B32;
+ CARD16 length;
+ CARD32 physicalScreen;
} xDMXGetScreenAttributesReq;
#define sz_xDMXGetScreenAttributesReq 8
@@ -176,22 +176,22 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 displayNameLength B32;
- CARD32 logicalScreen B32;
-
- CARD16 screenWindowWidth B16;
- CARD16 screenWindowHeight B16;
- INT16 screenWindowXoffset B16;
- INT16 screenWindowYoffset B16;
-
- CARD16 rootWindowWidth B16;
- CARD16 rootWindowHeight B16;
- INT16 rootWindowXoffset B16;
- INT16 rootWindowYoffset B16;
- INT16 rootWindowXorigin B16;
- INT16 rootWindowYorigin B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 displayNameLength;
+ CARD32 logicalScreen;
+
+ CARD16 screenWindowWidth;
+ CARD16 screenWindowHeight;
+ INT16 screenWindowXoffset;
+ INT16 screenWindowYoffset;
+
+ CARD16 rootWindowWidth;
+ CARD16 rootWindowHeight;
+ INT16 rootWindowXoffset;
+ INT16 rootWindowYoffset;
+ INT16 rootWindowXorigin;
+ INT16 rootWindowYorigin;
} xDMXGetScreenAttributesReply;
#define sz_xDMXGetScreenAttributesReply 36
@@ -199,9 +199,9 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXChangeScreensAttributes */
- CARD16 length B16;
- CARD32 screenCount B32;
- CARD32 maskCount B32;
+ CARD16 length;
+ CARD32 screenCount;
+ CARD32 maskCount;
} xDMXChangeScreensAttributesReq;
#define sz_xDMXChangeScreensAttributesReq 12
@@ -209,14 +209,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 errorScreen B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 errorScreen;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xDMXChangeScreensAttributesReply;
#define sz_xDMXChangeScreensAttributesReply 32
@@ -224,10 +224,10 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXAddScreen */
- CARD16 length B16;
- CARD32 displayNameLength B32;
- CARD32 physicalScreen B32;
- CARD32 valueMask B32;
+ CARD16 length;
+ CARD32 displayNameLength;
+ CARD32 physicalScreen;
+ CARD32 valueMask;
} xDMXAddScreenReq;
#define sz_xDMXAddScreenReq 16
@@ -235,14 +235,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 physicalScreen B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 physicalScreen;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xDMXAddScreenReply;
#define sz_xDMXAddScreenReply 32
@@ -250,8 +250,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXRemoveScreen */
- CARD16 length B16;
- CARD32 physicalScreen B32;
+ CARD16 length;
+ CARD32 physicalScreen;
} xDMXRemoveScreenReq;
#define sz_xDMXRemoveScreenReq 8
@@ -259,14 +259,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXRemoveScreenReply;
#define sz_xDMXRemoveScreenReply 32
@@ -274,8 +274,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetWindowAttributes */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xDMXGetWindowAttributesReq;
#define sz_xDMXGetWindowAttributesReq 8
@@ -283,14 +283,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 screenCount B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 screenCount;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXGetWindowAttributesReply;
#define sz_xDMXGetWindowAttributesReply 32
@@ -298,7 +298,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetDesktopAttributes */
- CARD16 length B16;
+ CARD16 length;
} xDMXGetDesktopAttributesReq;
#define sz_xDMXGetDesktopAttributesReq 4
@@ -306,16 +306,16 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
INT16 width;
INT16 height;
INT16 shiftX;
INT16 shiftY;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xDMXGetDesktopAttributesReply;
#define sz_xDMXGetDesktopAttributesReply 32
@@ -323,8 +323,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXChangeDesktopAttributes */
- CARD16 length B16;
- CARD32 valueMask B32;
+ CARD16 length;
+ CARD32 valueMask;
} xDMXChangeDesktopAttributesReq;
#define sz_xDMXChangeDesktopAttributesReq 8
@@ -332,14 +332,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXChangeDesktopAttributesReply;
#define sz_xDMXChangeDesktopAttributesReply 32
@@ -347,7 +347,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetInputCount */
- CARD16 length B16;
+ CARD16 length;
} xDMXGetInputCountReq;
#define sz_xDMXGetInputCountReq 4
@@ -355,14 +355,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 inputCount B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 inputCount;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXGetInputCountReply;
#define sz_xDMXGetInputCountReply 32
@@ -370,8 +370,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXGetInputAttributes */
- CARD16 length B16;
- CARD32 deviceId B32;
+ CARD16 length;
+ CARD32 deviceId;
} xDMXGetInputAttributesReq;
#define sz_xDMXGetInputAttributesReq 8
@@ -379,17 +379,17 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 inputType B32;
- CARD32 physicalScreen B32;
- CARD32 physicalId B32;
- CARD32 nameLength B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 inputType;
+ CARD32 physicalScreen;
+ CARD32 physicalId;
+ CARD32 nameLength;
BOOL isCore;
BOOL sendsCore;
BOOL detached;
CARD8 pad0;
- CARD32 pad1 B32;
+ CARD32 pad1;
} xDMXGetInputAttributesReply;
#define sz_xDMXGetInputAttributesReply 32
@@ -397,8 +397,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXAddInput */
- CARD16 length B16;
- CARD32 displayNameLength B32;
+ CARD16 length;
+ CARD32 displayNameLength;
CARD32 valueMask;
} xDMXAddInputReq;
#define sz_xDMXAddInputReq 12
@@ -407,14 +407,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 physicalId B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 physicalId;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xDMXAddInputReply;
#define sz_xDMXAddInputReply 32
@@ -422,8 +422,8 @@ typedef struct {
typedef struct {
CARD8 reqType; /* DMXCode */
CARD8 dmxReqType; /* X_DMXRemoveInput */
- CARD16 length B16;
- CARD32 physicalId B32;
+ CARD16 length;
+ CARD32 physicalId;
} xDMXRemoveInputReq;
#define sz_xDMXRemoveInputReq 8
@@ -431,14 +431,14 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDMXRemoveInputReply;
#define sz_xDMXRemoveInputReply 32
diff --git a/include/X11/extensions/dpmsproto.h b/include/X11/extensions/dpmsproto.h
index 63fd3fc..c847016 100644
--- a/include/X11/extensions/dpmsproto.h
+++ b/include/X11/extensions/dpmsproto.h
@@ -48,127 +48,127 @@ Equipment Corporation.
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSGetVersion */
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xDPMSGetVersionReq;
#define sz_xDPMSGetVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDPMSGetVersionReply;
#define sz_xDPMSGetVersionReply 32
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSCapable */
- CARD16 length B16;
+ CARD16 length;
} xDPMSCapableReq;
#define sz_xDPMSCapableReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL capable;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xDPMSCapableReply;
#define sz_xDPMSCapableReply 32
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSGetTimeouts */
- CARD16 length B16;
+ CARD16 length;
} xDPMSGetTimeoutsReq;
#define sz_xDPMSGetTimeoutsReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 standby B16;
- CARD16 suspend B16;
- CARD16 off B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 standby;
+ CARD16 suspend;
+ CARD16 off;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDPMSGetTimeoutsReply;
#define sz_xDPMSGetTimeoutsReply 32
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSSetTimeouts */
- CARD16 length B16;
- CARD16 standby B16;
- CARD16 suspend B16;
- CARD16 off B16;
- CARD16 pad0 B16;
+ CARD16 length;
+ CARD16 standby;
+ CARD16 suspend;
+ CARD16 off;
+ CARD16 pad0;
} xDPMSSetTimeoutsReq;
#define sz_xDPMSSetTimeoutsReq 12
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSEnable */
- CARD16 length B16;
+ CARD16 length;
} xDPMSEnableReq;
#define sz_xDPMSEnableReq 4
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSDisable */
- CARD16 length B16;
+ CARD16 length;
} xDPMSDisableReq;
#define sz_xDPMSDisableReq 4
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSForceLevel */
- CARD16 length B16;
- CARD16 level B16; /* power level requested */
- CARD16 pad0 B16;
+ CARD16 length;
+ CARD16 level; /* power level requested */
+ CARD16 pad0;
} xDPMSForceLevelReq;
#define sz_xDPMSForceLevelReq 8
typedef struct {
CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSInfo */
- CARD16 length B16;
+ CARD16 length;
} xDPMSInfoReq;
#define sz_xDPMSInfoReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 power_level B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 power_level;
BOOL state;
CARD8 pad1;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xDPMSInfoReply;
#define sz_xDPMSInfoReply 32
diff --git a/include/X11/extensions/dri2proto.h b/include/X11/extensions/dri2proto.h
index 128b807..c1775fd 100644
--- a/include/X11/extensions/dri2proto.h
+++ b/include/X11/extensions/dri2proto.h
@@ -63,294 +63,294 @@
#define DRI2_InvalidateBuffers 1
typedef struct {
- CARD32 attachment B32;
- CARD32 name B32;
- CARD32 pitch B32;
- CARD32 cpp B32;
- CARD32 flags B32;
+ CARD32 attachment;
+ CARD32 name;
+ CARD32 pitch;
+ CARD32 cpp;
+ CARD32 flags;
} xDRI2Buffer;
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xDRI2QueryVersionReq;
#define sz_xDRI2QueryVersionReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDRI2QueryVersionReply;
#define sz_xDRI2QueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 window B32;
- CARD32 driverType B32;
+ CARD16 length;
+ CARD32 window;
+ CARD32 driverType;
} xDRI2ConnectReq;
#define sz_xDRI2ConnectReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 driverNameLength B32;
- CARD32 deviceNameLength B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 driverNameLength;
+ CARD32 deviceNameLength;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDRI2ConnectReply;
#define sz_xDRI2ConnectReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 window B32;
- CARD32 magic B32;
+ CARD16 length;
+ CARD32 window;
+ CARD32 magic;
} xDRI2AuthenticateReq;
#define sz_xDRI2AuthenticateReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 authenticated B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 authenticated;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xDRI2AuthenticateReply;
#define sz_xDRI2AuthenticateReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 drawable;
} xDRI2CreateDrawableReq;
#define sz_xDRI2CreateDrawableReq 8
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 drawable;
} xDRI2DestroyDrawableReq;
#define sz_xDRI2DestroyDrawableReq 8
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 count B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 count;
} xDRI2GetBuffersReq;
#define sz_xDRI2GetBuffersReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 count B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 width;
+ CARD32 height;
+ CARD32 count;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDRI2GetBuffersReply;
#define sz_xDRI2GetBuffersReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 region B32;
- CARD32 dest B32;
- CARD32 src B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 region;
+ CARD32 dest;
+ CARD32 src;
} xDRI2CopyRegionReq;
#define sz_xDRI2CopyRegionReq 20
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xDRI2CopyRegionReply;
#define sz_xDRI2CopyRegionReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 target_msc_hi B32;
- CARD32 target_msc_lo B32;
- CARD32 divisor_hi B32;
- CARD32 divisor_lo B32;
- CARD32 remainder_hi B32;
- CARD32 remainder_lo B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 target_msc_hi;
+ CARD32 target_msc_lo;
+ CARD32 divisor_hi;
+ CARD32 divisor_lo;
+ CARD32 remainder_hi;
+ CARD32 remainder_lo;
} xDRI2SwapBuffersReq;
#define sz_xDRI2SwapBuffersReq 32
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 swap_hi B32;
- CARD32 swap_lo B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 swap_hi;
+ CARD32 swap_lo;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDRI2SwapBuffersReply;
#define sz_xDRI2SwapBuffersReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
+ CARD16 length;
+ CARD32 drawable;
} xDRI2GetMSCReq;
#define sz_xDRI2GetMSCReq 8
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 target_msc_hi B32;
- CARD32 target_msc_lo B32;
- CARD32 divisor_hi B32;
- CARD32 divisor_lo B32;
- CARD32 remainder_hi B32;
- CARD32 remainder_lo B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 target_msc_hi;
+ CARD32 target_msc_lo;
+ CARD32 divisor_hi;
+ CARD32 divisor_lo;
+ CARD32 remainder_hi;
+ CARD32 remainder_lo;
} xDRI2WaitMSCReq;
#define sz_xDRI2WaitMSCReq 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 target_sbc_hi B32;
- CARD32 target_sbc_lo B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 target_sbc_hi;
+ CARD32 target_sbc_lo;
} xDRI2WaitSBCReq;
#define sz_xDRI2WaitSBCReq 16
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 ust_hi B32;
- CARD32 ust_lo B32;
- CARD32 msc_hi B32;
- CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 ust_hi;
+ CARD32 ust_lo;
+ CARD32 msc_hi;
+ CARD32 msc_lo;
+ CARD32 sbc_hi;
+ CARD32 sbc_lo;
} xDRI2MSCReply;
#define sz_xDRI2MSCReply 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 interval B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 interval;
} xDRI2SwapIntervalReq;
#define sz_xDRI2SwapIntervalReq 12
typedef struct {
CARD8 type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD16 event_type B16;
+ CARD16 sequenceNumber;
+ CARD16 event_type;
CARD16 pad2;
- CARD32 drawable B32;
- CARD32 ust_hi B32;
- CARD32 ust_lo B32;
- CARD32 msc_hi B32;
- CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD32 drawable;
+ CARD32 ust_hi;
+ CARD32 ust_lo;
+ CARD32 msc_hi;
+ CARD32 msc_lo;
+ CARD32 sbc_hi;
+ CARD32 sbc_lo;
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32
typedef struct {
CARD8 type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD16 event_type B16;
+ CARD16 sequenceNumber;
+ CARD16 event_type;
CARD16 pad2;
- CARD32 drawable B32;
- CARD32 ust_hi B32;
- CARD32 ust_lo B32;
- CARD32 msc_hi B32;
- CARD32 msc_lo B32;
- CARD32 sbc B32;
+ CARD32 drawable;
+ CARD32 ust_hi;
+ CARD32 ust_lo;
+ CARD32 msc_hi;
+ CARD32 msc_lo;
+ CARD32 sbc;
} xDRI2BufferSwapComplete2;
#define sz_xDRI2BufferSwapComplete2 32
typedef struct {
CARD8 type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 drawable B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 drawable;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xDRI2InvalidateBuffers;
#define sz_xDRI2InvalidateBuffers 32
typedef struct {
CARD8 reqType;
CARD8 dri2ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 param B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 param;
} xDRI2GetParamReq;
#define sz_xDRI2GetParamReq 12
typedef struct {
BYTE type; /*X_Reply*/
BOOL is_param_recognized;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 value_hi B32;
- CARD32 value_lo B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 value_hi;
+ CARD32 value_lo;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xDRI2GetParamReply;
#define sz_xDRI2GetParamReply 32
diff --git a/include/X11/extensions/dri3proto.h b/include/X11/extensions/dri3proto.h
index 51b825d..d1f909b 100644
--- a/include/X11/extensions/dri3proto.h
+++ b/include/X11/extensions/dri3proto.h
@@ -47,59 +47,59 @@
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xDRI3QueryVersionReq;
#define sz_xDRI3QueryVersionReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xDRI3QueryVersionReply;
#define sz_xDRI3QueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 provider B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 provider;
} xDRI3OpenReq;
#define sz_xDRI3OpenReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 nfd;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xDRI3OpenReply;
#define sz_xDRI3OpenReply 32
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 pixmap B32;
- CARD32 drawable B32;
- CARD32 size B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 stride B16;
+ CARD16 length;
+ CARD32 pixmap;
+ CARD32 drawable;
+ CARD32 size;
+ CARD16 width;
+ CARD16 height;
+ CARD16 stride;
CARD8 depth;
CARD8 bpp;
} xDRI3PixmapFromBufferReq;
@@ -109,37 +109,37 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 pixmap B32;
+ CARD16 length;
+ CARD32 pixmap;
} xDRI3BufferFromPixmapReq;
#define sz_xDRI3BufferFromPixmapReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 nfd; /* Number of file descriptors returned (1) */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 size B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 stride B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 size;
+ CARD16 width;
+ CARD16 height;
+ CARD16 stride;
CARD8 depth;
CARD8 bpp;
- CARD32 pad20 B32;
- CARD32 pad24 B32;
- CARD32 pad28 B32;
+ CARD32 pad20;
+ CARD32 pad24;
+ CARD32 pad28;
} xDRI3BufferFromPixmapReply;
#define sz_xDRI3BufferFromPixmapReply 32
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 fence B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 fence;
BOOL initially_triggered;
CARD8 pad13;
- CARD16 pad14 B16;
+ CARD16 pad14;
} xDRI3FenceFromFDReq;
#define sz_xDRI3FenceFromFDReq 16
@@ -147,9 +147,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 drawable B32;
- CARD32 fence B32;
+ CARD16 length;
+ CARD32 drawable;
+ CARD32 fence;
} xDRI3FDFromFenceReq;
#define sz_xDRI3FDFromFenceReq 12
@@ -157,14 +157,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 nfd; /* Number of file descriptors returned (1) */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad08 B32;
- CARD32 pad12 B32;
- CARD32 pad16 B32;
- CARD32 pad20 B32;
- CARD32 pad24 B32;
- CARD32 pad28 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad08;
+ CARD32 pad12;
+ CARD32 pad16;
+ CARD32 pad20;
+ CARD32 pad24;
+ CARD32 pad28;
} xDRI3FDFromFenceReply;
#define sz_xDRI3FDFromFenceReply 32
@@ -174,50 +174,50 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
CARD8 depth;
CARD8 bpp;
- CARD16 pad10 B16;
+ CARD16 pad10;
} xDRI3GetSupportedModifiersReq;
#define sz_xDRI3GetSupportedModifiersReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numWindowModifiers B32;
- CARD32 numScreenModifiers B32;
- CARD32 pad16 B32;
- CARD32 pad20 B32;
- CARD32 pad24 B32;
- CARD32 pad28 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numWindowModifiers;
+ CARD32 numScreenModifiers;
+ CARD32 pad16;
+ CARD32 pad20;
+ CARD32 pad24;
+ CARD32 pad28;
} xDRI3GetSupportedModifiersReply;
#define sz_xDRI3GetSupportedModifiersReply 32
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 pixmap B32;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 pixmap;
+ CARD32 window;
CARD8 num_buffers; /* Number of file descriptors passed */
CARD8 pad13;
- CARD16 pad14 B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 stride0 B32;
- CARD32 offset0 B32;
- CARD32 stride1 B32;
- CARD32 offset1 B32;
- CARD32 stride2 B32;
- CARD32 offset2 B32;
- CARD32 stride3 B32;
- CARD32 offset3 B32;
+ CARD16 pad14;
+ CARD16 width;
+ CARD16 height;
+ CARD32 stride0;
+ CARD32 offset0;
+ CARD32 stride1;
+ CARD32 offset1;
+ CARD32 stride2;
+ CARD32 offset2;
+ CARD32 stride3;
+ CARD32 offset3;
CARD8 depth;
CARD8 bpp;
- CARD16 pad54 B16;
+ CARD16 pad54;
CARD64 modifier;
} xDRI3PixmapFromBuffersReq;
#define sz_xDRI3PixmapFromBuffersReq 64
@@ -225,24 +225,24 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 dri3ReqType;
- CARD16 length B16;
- CARD32 pixmap B32;
+ CARD16 length;
+ CARD32 pixmap;
} xDRI3BuffersFromPixmapReq;
#define sz_xDRI3BuffersFromPixmapReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 nfd; /* Number of file descriptors returned */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 pad12 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 width;
+ CARD16 height;
+ CARD32 pad12;
CARD64 modifier;
CARD8 depth;
CARD8 bpp;
- CARD16 pad26 B16;
- CARD32 pad28 B32;
+ CARD16 pad26;
+ CARD32 pad28;
} xDRI3BuffersFromPixmapReply;
#define sz_xDRI3BuffersFromPixmapReply 32
diff --git a/include/X11/extensions/evieproto.h b/include/X11/extensions/evieproto.h
index 649c91a..73822d5 100644
--- a/include/X11/extensions/evieproto.h
+++ b/include/X11/extensions/evieproto.h
@@ -42,113 +42,113 @@ DEALINGS IN THE SOFTWARE.
typedef struct _XevieQueryVersion {
CARD8 reqType;
CARD8 xevieReqType;
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
+ CARD16 length;
+ CARD16 client_major_version;
+ CARD16 client_minor_version;
} xXevieQueryVersionReq;
#define sz_xXevieQueryVersionReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD16 server_major_version;
+ CARD16 server_minor_version;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXevieQueryVersionReply;
#define sz_xXevieQueryVersionReply 32
typedef struct _XevieStart {
CARD8 reqType;
CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXevieStartReq;
#define sz_xXevieStartReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXevieStartReply;
#define sz_xXevieStartReply 32
typedef struct _XevieEnd {
CARD8 reqType;
CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 cmap B32;
+ CARD16 length;
+ CARD32 cmap;
} xXevieEndReq;
#define sz_xXevieEndReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXevieEndReply;
#define sz_xXevieEndReply 32
typedef struct _XevieSend {
CARD8 reqType;
CARD8 xevieReqType;
- CARD16 length B16;
+ CARD16 length;
xEvent event;
- CARD32 dataType B32;
+ CARD32 dataType;
} xXevieSendReq;
#define sz_xXevieSendReq 104
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXevieSendReply;
#define sz_xXevieSendReply 32
typedef struct _XevieSelectInput {
CARD8 reqType;
CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 event_mask B32;
+ CARD16 length;
+ CARD32 event_mask;
} xXevieSelectInputReq;
#define sz_xXevieSelectInputReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequence_number;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXevieSelectInputReply;
#define sz_xXevieSelectInputReply 32
diff --git a/include/X11/extensions/fontcachstr.h b/include/X11/extensions/fontcachstr.h
index eab704e..50f05d0 100644
--- a/include/X11/extensions/fontcachstr.h
+++ b/include/X11/extensions/fontcachstr.h
@@ -44,86 +44,86 @@
typedef struct _FontCacheQueryVersion {
CARD8 reqType; /* always FontCacheReqCode */
CARD8 fontcacheReqType; /* always X_FontCacheQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xFontCacheQueryVersionReq;
#define sz_xFontCacheQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Font-Cache */
- CARD16 minorVersion B16; /* minor version of Font-Cache */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of Font-Cache */
+ CARD16 minorVersion; /* minor version of Font-Cache */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xFontCacheQueryVersionReply;
#define sz_xFontCacheQueryVersionReply 32
typedef struct _FontCacheGetCacheSettings {
CARD8 reqType; /* always FontCacheReqCode */
CARD8 fontcacheReqType; /* always X_FontCacheGetCacheSettings */
- CARD16 length B16;
+ CARD16 length;
} xFontCacheGetCacheSettingsReq;
#define sz_xFontCacheGetCacheSettingsReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 himark;
+ CARD32 lowmark;
+ CARD32 balance;
+ CARD32 reserve0;
+ CARD32 reserve1;
+ CARD32 reserve2;
} xFontCacheGetCacheSettingsReply;
#define sz_xFontCacheGetCacheSettingsReply 32
typedef struct _FontCacheChangeCacheSettings {
CARD8 reqType; /* always FontCacheReqCode */
CARD8 fontcacheReqType; /* always X_FontCacheChangeCacheSettings */
- CARD16 length B16;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
- CARD32 reserve3 B32;
+ CARD16 length;
+ CARD32 himark;
+ CARD32 lowmark;
+ CARD32 balance;
+ CARD32 reserve0;
+ CARD32 reserve1;
+ CARD32 reserve2;
+ CARD32 reserve3;
} xFontCacheChangeCacheSettingsReq;
#define sz_xFontCacheChangeCacheSettingsReq 32
typedef struct _FontCacheGetCacheStatistics {
CARD8 reqType; /* always FontCacheReqCode */
CARD8 fontcacheReqType; /* always X_FontCacheGetCacheStatistics */
- CARD16 length B16;
+ CARD16 length;
} xFontCacheGetCacheStatisticsReq;
#define sz_xFontCacheGetCacheStatisticsReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 purge_runs B32;
- CARD32 purge_stat B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 f_hits B32;
- CARD32 f_misshits B32;
- CARD32 f_purged B32;
- CARD32 f_usage B32;
- CARD32 f_reserve0 B32;
- CARD32 v_hits B32;
- CARD32 v_misshits B32;
- CARD32 v_purged B32;
- CARD32 v_usage B32;
- CARD32 v_reserve0 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 purge_runs;
+ CARD32 purge_stat;
+ CARD32 balance;
+ CARD32 reserve0;
+ CARD32 f_hits;
+ CARD32 f_misshits;
+ CARD32 f_purged;
+ CARD32 f_usage;
+ CARD32 f_reserve0;
+ CARD32 v_hits;
+ CARD32 v_misshits;
+ CARD32 v_purged;
+ CARD32 v_usage;
+ CARD32 v_reserve0;
} xFontCacheGetCacheStatisticsReply;
#define sz_xFontCacheGetCacheStatisticsReply 64
diff --git a/include/X11/extensions/geproto.h b/include/X11/extensions/geproto.h
index c8860dd..7b34be2 100644
--- a/include/X11/extensions/geproto.h
+++ b/include/X11/extensions/geproto.h
@@ -50,7 +50,7 @@
typedef struct {
CARD8 reqType;
CARD8 ReqType;
- CARD16 length B16;
+ CARD16 length;
} xGEReq;
@@ -58,9 +58,9 @@ typedef struct {
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GEQueryVersion */
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xGEQueryVersionReq;
#define sz_xGEQueryVersionReq 8
@@ -68,15 +68,15 @@ typedef struct {
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GEQueryVersion */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} xGEQueryVersionReply;
#define sz_xGEQueryVersionReply 32
diff --git a/include/X11/extensions/lbxproto.h b/include/X11/extensions/lbxproto.h
index a1ae62b..8e858aa 100644
--- a/include/X11/extensions/lbxproto.h
+++ b/include/X11/extensions/lbxproto.h
@@ -95,93 +95,93 @@
typedef struct {
BOOL success; /* TRUE */
BOOL changeType;
- CARD16 majorVersion B16,
- minorVersion B16;
- CARD16 length B16; /* 1/4 additional bytes in setup info */
- CARD32 tag B32;
+ CARD16 majorVersion,
+ minorVersion;
+ CARD16 length; /* 1/4 additional bytes in setup info */
+ CARD32 tag;
} xLbxConnSetupPrefix;
typedef struct _LbxQueryVersion {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xLbxQueryVersionReq;
#define sz_xLbxQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of LBX protocol */
- CARD16 minorVersion B16; /* minor version of LBX protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of LBX protocol */
+ CARD16 minorVersion; /* minor version of LBX protocol */
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxQueryVersionReply;
#define sz_xLbxQueryVersionReply 32
typedef struct _LbxStartProxy {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxStartProxy */
- CARD16 length B16;
+ CARD16 length;
} xLbxStartProxyReq;
#define sz_xLbxStartProxyReq 4
typedef struct _LbxStopProxy {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxStopProxy */
- CARD16 length B16;
+ CARD16 length;
} xLbxStopProxyReq;
#define sz_xLbxStopProxyReq 4
typedef struct _LbxSwitch {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxSwitch */
- CARD16 length B16;
- CARD32 client B32; /* new client */
+ CARD16 length;
+ CARD32 client; /* new client */
} xLbxSwitchReq;
#define sz_xLbxSwitchReq 8
typedef struct _LbxNewClient {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxNewClient */
- CARD16 length B16;
- CARD32 client B32; /* new client */
+ CARD16 length;
+ CARD32 client; /* new client */
} xLbxNewClientReq;
#define sz_xLbxNewClientReq 8
typedef struct _LbxCloseClient {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxCloseClient */
- CARD16 length B16;
- CARD32 client B32; /* new client */
+ CARD16 length;
+ CARD32 client; /* new client */
} xLbxCloseClientReq;
#define sz_xLbxCloseClientReq 8
typedef struct _LbxModifySequence {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxModifySequence */
- CARD16 length B16;
- CARD32 adjust B32;
+ CARD16 length;
+ CARD32 adjust;
} xLbxModifySequenceReq;
#define sz_xLbxModifySequenceReq 8
typedef struct _LbxAllowMotion {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxAllowMotion */
- CARD16 length B16;
- CARD32 num B32;
+ CARD16 length;
+ CARD32 num;
} xLbxAllowMotionReq;
#define sz_xLbxAllowMotionReq 8
typedef struct {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGrabCmap */
- CARD16 length B16;
- Colormap cmap B32;
+ CARD16 length;
+ Colormap cmap;
} xLbxGrabCmapReq;
#define sz_xLbxGrabCmapReq 8
@@ -201,14 +201,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 flags;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLbxGrabCmapReply;
#define sz_xLbxGrabCmapReply 32
#define sz_xLbxGrabCmapReplyHdr 8
@@ -217,35 +217,35 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxReleaseCmap */
- CARD16 length B16;
- Colormap cmap B32;
+ CARD16 length;
+ Colormap cmap;
} xLbxReleaseCmapReq;
#define sz_xLbxReleaseCmapReq 8
typedef struct {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxAllocColor */
- CARD16 length B16;
- Colormap cmap B32;
- CARD32 pixel B32;
- CARD16 red B16, green B16, blue B16;
- CARD16 pad B16;
+ CARD16 length;
+ Colormap cmap;
+ CARD32 pixel;
+ CARD16 red, green, blue;
+ CARD16 pad;
} xLbxAllocColorReq;
#define sz_xLbxAllocColorReq 20
typedef struct _LbxIncrementPixel {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxIncrementPixel */
- CARD16 length B16;
- CARD32 cmap B32;
- CARD32 pixel B32;
+ CARD16 length;
+ CARD32 cmap;
+ CARD32 pixel;
} xLbxIncrementPixelReq;
#define sz_xLbxIncrementPixelReq 12
typedef struct _LbxDelta {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxDelta */
- CARD16 length B16;
+ CARD16 length;
CARD8 diffs; /* number of diffs */
CARD8 cindex; /* cache index */
/* list of diffs follows */
@@ -255,75 +255,75 @@ typedef struct _LbxDelta {
typedef struct _LbxGetModifierMapping {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGetModifierMapping */
- CARD16 length B16;
+ CARD16 length;
} xLbxGetModifierMappingReq;
#define sz_xLbxGetModifierMappingReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 keyspermod;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 tag;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxGetModifierMappingReply;
#define sz_xLbxGetModifierMappingReply 32
typedef struct _LbxGetKeyboardMapping {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGetKeyboardMapping */
- CARD16 length B16;
+ CARD16 length;
KeyCode firstKeyCode;
CARD8 count;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xLbxGetKeyboardMappingReq;
#define sz_xLbxGetKeyboardMappingReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 keysperkeycode;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 tag;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxGetKeyboardMappingReply;
#define sz_xLbxGetKeyboardMappingReply 32
typedef struct _LbxQueryFont {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxQueryFont */
- CARD16 length B16;
- CARD32 fid B32;
+ CARD16 length;
+ CARD32 fid;
} xLbxQueryFontReq;
#define sz_xLbxQueryFontReq 8
typedef struct _LbxInternAtoms {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxInternAtoms */
- CARD16 length B16;
- CARD16 num B16;
+ CARD16 length;
+ CARD16 num;
} xLbxInternAtomsReq;
#define sz_xLbxInternAtomsReq 6
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 atomsStart B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 atomsStart;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxInternAtomsReply;
#define sz_xLbxInternAtomsReply 32
#define sz_xLbxInternAtomsReplyHdr 8
@@ -332,39 +332,39 @@ typedef struct {
typedef struct _LbxGetWinAttrAndGeom {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGetWinAttrAndGeom */
- CARD16 length B16;
- CARD32 id B32; /* window id */
+ CARD16 length;
+ CARD32 id; /* window id */
} xLbxGetWinAttrAndGeomReq;
#define sz_xLbxGetWinAttrAndGeomReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 backingStore;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* NOT 0; this is an extra-large reply */
- VisualID visualID B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* NOT 0; this is an extra-large reply */
+ VisualID visualID;
#if defined(__cplusplus) || defined(c_plusplus)
- CARD16 c_class B16;
+ CARD16 c_class;
#else
- CARD16 class B16;
+ CARD16 class;
#endif
CARD8 bitGravity;
CARD8 winGravity;
- CARD32 backingBitPlanes B32;
- CARD32 backingPixel B32;
+ CARD32 backingBitPlanes;
+ CARD32 backingPixel;
BOOL saveUnder;
BOOL mapInstalled;
CARD8 mapState;
BOOL override;
- Colormap colormap B32;
- CARD32 allEventMasks B32;
- CARD32 yourEventMask B32;
- CARD16 doNotPropagateMask B16;
- CARD16 pad1 B16;
- Window root B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD16 borderWidth B16;
+ Colormap colormap;
+ CARD32 allEventMasks;
+ CARD32 yourEventMask;
+ CARD16 doNotPropagateMask;
+ CARD16 pad1;
+ Window root;
+ INT16 x, y;
+ CARD16 width, height;
+ CARD16 borderWidth;
CARD8 depth;
CARD8 pad2;
} xLbxGetWinAttrAndGeomReply;
@@ -374,21 +374,21 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxSync */
- CARD16 length B16;
+ CARD16 length;
} xLbxSyncReq;
#define sz_xLbxSyncReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xLbxSyncReply;
#define sz_xLbxSyncReply 32
@@ -415,7 +415,7 @@ typedef struct {
#define LBX_MASK_BITS(val, n) ((unsigned int) ((val) & ((1 << (n)) - 1)))
typedef struct {
- CARD32 metrics B32;
+ CARD32 metrics;
} xLbxCharInfo;
/* note that this is identical to xQueryFontReply except for missing
@@ -425,33 +425,33 @@ typedef struct {
xCharInfo minBounds;
/* XXX do we need to leave this gunk? */
#ifndef WORD64
- CARD32 walign1 B32;
+ CARD32 walign1;
#endif
xCharInfo maxBounds;
#ifndef WORD64
- CARD32 walign2 B32;
+ CARD32 walign2;
#endif
- CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
- CARD16 defaultChar B16;
- CARD16 nFontProps B16; /* followed by this many xFontProp structures */
+ CARD16 minCharOrByte2, maxCharOrByte2;
+ CARD16 defaultChar;
+ CARD16 nFontProps; /* followed by this many xFontProp structures */
CARD8 drawDirection;
CARD8 minByte1, maxByte1;
BOOL allCharsExist;
- INT16 fontAscent B16, fontDescent B16;
- CARD32 nCharInfos B32; /* followed by this many xLbxCharInfo structures */
+ INT16 fontAscent, fontDescent;
+ CARD32 nCharInfos; /* followed by this many xLbxCharInfo structures */
} xLbxFontInfo;
typedef struct {
BYTE type; /* X_Reply */
CARD8 compression;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 tag;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
/* X_QueryFont sticks much of the data in the base reply packet,
* but we hope that it won't be needed, (and it won't fit in 32 bytes
* with the tag anyways)
@@ -464,65 +464,65 @@ typedef struct {
typedef struct _LbxChangeProperty {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxChangeProperty */
- CARD16 length B16;
- Window window B32;
- Atom property B32;
- Atom type B32;
+ CARD16 length;
+ Window window;
+ Atom property;
+ Atom type;
CARD8 format;
CARD8 mode;
BYTE pad[2];
- CARD32 nUnits B32;
+ CARD32 nUnits;
} xLbxChangePropertyReq;
#define sz_xLbxChangePropertyReq 24
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 tag;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxChangePropertyReply;
#define sz_xLbxChangePropertyReply 32
typedef struct _LbxGetProperty {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGetProperty */
- CARD16 length B16;
- Window window B32;
- Atom property B32;
- Atom type B32;
+ CARD16 length;
+ Window window;
+ Atom property;
+ Atom type;
CARD8 delete;
BYTE pad[3];
- CARD32 longOffset B32;
- CARD32 longLength B32;
+ CARD32 longOffset;
+ CARD32 longLength;
} xLbxGetPropertyReq;
#define sz_xLbxGetPropertyReq 28
typedef struct {
BYTE type; /* X_Reply */
CARD8 format;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32;
- CARD32 tag B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom propertyType;
+ CARD32 bytesAfter;
+ CARD32 nItems;
+ CARD32 tag;
+ CARD32 pad1;
+ CARD32 pad2;
} xLbxGetPropertyReply;
#define sz_xLbxGetPropertyReply 32
typedef struct _LbxTagData {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxTagData */
- CARD16 length B16;
- XID tag B32;
- CARD32 real_length B32;
+ CARD16 length;
+ XID tag;
+ CARD32 real_length;
/* data */
} xLbxTagDataReq;
#define sz_xLbxTagDataReq 12
@@ -530,15 +530,15 @@ typedef struct _LbxTagData {
typedef struct _LbxInvalidateTag {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxInvalidateTag */
- CARD16 length B16;
- CARD32 tag B32;
+ CARD16 length;
+ CARD32 tag;
} xLbxInvalidateTagReq;
#define sz_xLbxInvalidateTagReq 8
typedef struct _LbxPutImage {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxPutImage */
- CARD16 length B16;
+ CARD16 length;
CARD8 compressionMethod;
CARD8 cacheEnts;
CARD8 bitPacked;
@@ -549,14 +549,14 @@ typedef struct _LbxPutImage {
typedef struct {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxGetImage */
- CARD16 length B16;
- Drawable drawable B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD32 planeMask B32;
+ CARD16 length;
+ Drawable drawable;
+ INT16 x, y;
+ CARD16 width, height;
+ CARD32 planeMask;
CARD8 format;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xLbxGetImageReq;
#define sz_xLbxGetImageReq 24
@@ -564,16 +564,16 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 depth;
- CARD16 sequenceNumber B16;
- CARD32 lbxLength B32;
- CARD32 xLength B32;
- VisualID visual B32;
+ CARD16 sequenceNumber;
+ CARD32 lbxLength;
+ CARD32 xLength;
+ VisualID visual;
CARD8 compressionMethod;
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLbxGetImageReply;
#define sz_xLbxGetImageReply 32
@@ -592,7 +592,7 @@ typedef struct {
typedef struct _LbxPolyPoint {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 cacheEnts;
CARD8 padBytes;
} xLbxPolyPointReq;
@@ -616,7 +616,7 @@ typedef xLbxPolyPointReq xLbxPolyFillArcReq;
typedef struct _LbxFillPoly {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 cacheEnts;
BYTE shape;
CARD8 padBytes;
@@ -626,7 +626,7 @@ typedef struct _LbxFillPoly {
typedef struct _LbxCopyArea {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 srcCache; /* source drawable */
CARD8 cacheEnts; /* dest drawable and gc */
/* followed by encoded src x, src y, dst x, dst y, width, height */
@@ -637,8 +637,8 @@ typedef struct _LbxCopyArea {
typedef struct _LbxCopyPlane {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
- CARD32 bitPlane B32;
+ CARD16 length;
+ CARD32 bitPlane;
CARD8 srcCache; /* source drawable */
CARD8 cacheEnts; /* dest drawable and gc */
/* followed by encoded src x, src y, dst x, dst y, width, height */
@@ -649,7 +649,7 @@ typedef struct _LbxCopyPlane {
typedef struct _LbxPolyText {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 cacheEnts;
/* followed by encoded src x, src y coordinates and text elts */
} xLbxPolyTextReq;
@@ -666,7 +666,7 @@ typedef xLbxPolyTextReq xLbxPolyText16Req;
typedef struct _LbxImageText {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 cacheEnts;
CARD8 nChars;
/* followed by encoded src x, src y coordinates and string */
@@ -688,14 +688,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 nOpts;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 optDataStart B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 optDataStart;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxStartReply;
#define sz_xLbxStartReply 32
#define sz_xLbxStartReplyHdr 8
@@ -703,25 +703,25 @@ typedef struct {
typedef struct _LbxQueryExtension {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxQueryExtension */
- CARD16 length B16;
- CARD32 nbytes B32;
+ CARD16 length;
+ CARD32 nbytes;
} xLbxQueryExtensionReq;
#define sz_xLbxQueryExtensionReq 8
typedef struct _LbxQueryExtensionReply {
BYTE type; /* X_Reply */
CARD8 numReqs;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL present;
CARD8 major_opcode;
CARD8 first_event;
CARD8 first_error;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
/* reply & event generating requests */
} xLbxQueryExtensionReply;
@@ -731,15 +731,15 @@ typedef struct _LbxQueryExtensionReply {
typedef struct _LbxBeginLargeRequest {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxBeginLargeRequest */
- CARD16 length B16;
- CARD32 largeReqLength B32;
+ CARD16 length;
+ CARD32 largeReqLength;
} xLbxBeginLargeRequestReq;
#define sz_BeginLargeRequestReq 8
typedef struct _LbxLargeRequestData {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxLargeRequestData */
- CARD16 length B16;
+ CARD16 length;
/* followed by LISTofCARD8 data */
} xLbxLargeRequestDataReq;
#define sz_LargeRequestDataReq 4
@@ -747,7 +747,7 @@ typedef struct _LbxLargeRequestData {
typedef struct _LbxEndLargeRequest {
CARD8 reqType; /* always LbxReqCode */
CARD8 lbxReqType; /* always X_LbxEndLargeRequest */
- CARD16 length B16;
+ CARD16 length;
} xLbxEndLargeRequestReq;
#define sz_EndLargeRequestReq 4
@@ -756,92 +756,92 @@ typedef struct _LbxEndLargeRequest {
typedef struct _LbxSwitchEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxSwitchEvent */
- CARD16 pad B16;
- CARD32 client B32;
+ CARD16 pad;
+ CARD32 client;
} xLbxSwitchEvent;
#define sz_xLbxSwitchEvent 8
typedef struct _LbxCloseEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxCloseEvent */
- CARD16 sequenceNumber B16;
- CARD32 client B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 client;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xLbxCloseEvent;
#define sz_xLbxCloseEvent 32
typedef struct _LbxInvalidateTagEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxInvalidateTagEvent */
- CARD16 sequenceNumber B16;
- CARD32 tag B32;
- CARD32 tagType B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 tag;
+ CARD32 tagType;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLbxInvalidateTagEvent;
#define sz_xLbxInvalidateTagEvent 32
typedef struct _LbxSendTagDataEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxSendTagDataEvent */
- CARD16 sequenceNumber B16;
- CARD32 tag B32;
- CARD32 tagType B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 tag;
+ CARD32 tagType;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLbxSendTagDataEvent;
#define sz_xLbxSendTagDataEvent 32
typedef struct _LbxListenToOneEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxListenToOneEvent */
- CARD16 sequenceNumber B16;
- CARD32 client B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 client;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xLbxListenToOneEvent;
#define sz_xLbxListenToOneEvent 32
typedef struct _LbxListenToAllEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxListenToAllEvent */
- CARD16 sequenceNumber B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xLbxListenToAllEvent;
#define sz_xLbxListenToOneEvent 32
typedef struct _LbxReleaseCmapEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxReleaseCmapEvent */
- CARD16 sequenceNumber B16;
- Colormap colormap B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ Colormap colormap;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xLbxReleaseCmapEvent;
#define sz_xLbxReleaseCmapEvent 32
@@ -849,14 +849,14 @@ typedef struct _LbxReleaseCmapEvent {
typedef struct _LbxFreeCellsEvent {
BYTE type; /* always eventBase + LbxEvent */
BYTE lbxType; /* LbxFreeCellsEvent */
- CARD16 sequenceNumber B16;
- Colormap colormap B32;
- CARD32 pixelStart B32;
- CARD32 pixelEnd B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ Colormap colormap;
+ CARD32 pixelStart;
+ CARD32 pixelEnd;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xLbxFreeCellsEvent;
#define sz_xLbxFreeCellsEvent 32
diff --git a/include/X11/extensions/lgewire.h b/include/X11/extensions/lgewire.h
index 4e5a036..ba40bd6 100644
--- a/include/X11/extensions/lgewire.h
+++ b/include/X11/extensions/lgewire.h
@@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group.
typedef struct {
CARD8 reqType;
CARD8 lgeReqType;
- CARD16 length B16;
+ CARD16 length;
} xLgeQueryVersionReq;
#define sz_xLgeQueryVersionReq sizeof(xLgeQueryVersionReq)
@@ -63,14 +63,14 @@ typedef struct {
/* Always X_Reply */
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 implementation B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 implementation;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xLgeQueryVersionReply;
#define sz_xLgeQueryVersionReply sizeof(xLgeQueryVersionReply)
@@ -78,10 +78,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 lgeReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 clientType;
BOOL sendEventDirect;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xLgeRegisterClientReq;
#define sz_xLgeRegisterClientReq sizeof(xLgeRegisterClientReq)
@@ -89,7 +89,7 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 lgeReqType;
- CARD16 length B16;
+ CARD16 length;
/* The pseudo-root window of the screen */
Window prw;
} xLgeRegisterScreenReq;
@@ -99,10 +99,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 lgeReqType;
- CARD16 length B16;
+ CARD16 length;
BOOL enable;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xLgeControlLgModeReq;
#define sz_xLgeControlLgModeReq sizeof(xLgeControlLgModeReq)
@@ -110,7 +110,7 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 lgeReqType;
- CARD16 length B16;
+ CARD16 length;
xEvent event;
} xLgeSendEventReq;
diff --git a/include/X11/extensions/mitmiscproto.h b/include/X11/extensions/mitmiscproto.h
index 18c202a..d42e4fc 100644
--- a/include/X11/extensions/mitmiscproto.h
+++ b/include/X11/extensions/mitmiscproto.h
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
typedef struct _SetBugMode {
CARD8 reqType; /* always MITReqCode */
CARD8 mitReqType; /* always X_MITSetBugMode */
- CARD16 length B16;
+ CARD16 length;
BOOL onOff;
BYTE pad0;
CARD16 pad1;
@@ -47,21 +47,21 @@ typedef struct _SetBugMode {
typedef struct _GetBugMode {
CARD8 reqType; /* always MITReqCode */
CARD8 mitReqType; /* always X_MITGetBugMode */
- CARD16 length B16;
+ CARD16 length;
} xMITGetBugModeReq;
#define sz_xMITGetBugModeReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL onOff;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xMITGetBugModeReply;
#define sz_xMITGetBugModeReply 32
diff --git a/include/X11/extensions/multibufproto.h b/include/X11/extensions/multibufproto.h
index e2184d3..19a6401 100644
--- a/include/X11/extensions/multibufproto.h
+++ b/include/X11/extensions/multibufproto.h
@@ -50,8 +50,8 @@ in this Software without prior written authorization from The Open Group.
typedef struct xMbufBufferInfo {
- CARD32 visualID B32; /* associated visual */
- CARD16 maxBuffers B16; /* maximum supported buffers */
+ CARD32 visualID; /* associated visual */
+ CARD16 maxBuffers; /* maximum supported buffers */
CARD8 depth; /* depth of visual (redundant) */
CARD8 unused;
} xMbufBufferInfo;
@@ -60,60 +60,60 @@ typedef struct xMbufBufferInfo {
typedef struct {
BYTE type;
BYTE unused;
- CARD16 sequenceNumber B16;
- CARD32 buffer B32; /* affected buffer */
+ CARD16 sequenceNumber;
+ CARD32 buffer; /* affected buffer */
BYTE state; /* current status */
CARD8 unused1;
- CARD16 unused2 B16;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
- CARD32 unused7 B32;
+ CARD16 unused2;
+ CARD32 unused3;
+ CARD32 unused4;
+ CARD32 unused5;
+ CARD32 unused6;
+ CARD32 unused7;
} xMbufClobberNotifyEvent;
typedef struct {
BYTE type;
BYTE unused;
- CARD16 sequenceNumber B16;
- CARD32 buffer B32; /* affected buffer */
- CARD32 timeStamp B32; /* update time */
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
+ CARD16 sequenceNumber;
+ CARD32 buffer; /* affected buffer */
+ CARD32 timeStamp; /* update time */
+ CARD32 unused1;
+ CARD32 unused2;
+ CARD32 unused3;
+ CARD32 unused4;
+ CARD32 unused5;
+ CARD32 unused6;
} xMbufUpdateNotifyEvent;
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufGetBufferVersion */
- CARD16 length B16;
+ CARD16 length;
} xMbufGetBufferVersionReq;
#define sz_xMbufGetBufferVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 majorVersion; /* major version of Multi-Buffering protocol */
CARD8 minorVersion; /* minor version of Multi-Buffering protocol */
- 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;
} xMbufGetBufferVersionReply;
#define sz_xMbufGetBufferVersionReply 32
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufCreateImageBuffers */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
+ CARD16 length;
+ CARD32 window; /* associated window */
CARD8 updateAction; /* action at update */
CARD8 updateHint; /* hint as to frequency of updates */
CARD16 unused;
@@ -123,123 +123,123 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 numberBuffer B16; /* number successfully allocated */
- CARD16 unused1 B16;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 numberBuffer; /* number successfully allocated */
+ CARD16 unused1;
+ CARD32 unused2;
+ CARD32 unused3;
+ CARD32 unused4;
+ CARD32 unused5;
+ CARD32 unused6;
} xMbufCreateImageBuffersReply;
#define sz_xMbufCreateImageBuffersReply 32
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufDestroyImageBuffers */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
+ CARD16 length;
+ CARD32 window; /* associated window */
} xMbufDestroyImageBuffersReq;
#define sz_xMbufDestroyImageBuffersReq 8
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufDisplayImageBuffers */
- CARD16 length B16;
- CARD16 minDelay B16; /* minimum time between last update and now */
- CARD16 maxDelay B16; /* maximum time between last update and now */
+ CARD16 length;
+ CARD16 minDelay; /* minimum time between last update and now */
+ CARD16 maxDelay; /* maximum time between last update and now */
} xMbufDisplayImageBuffersReq; /* followed by list of buffers */
#define sz_xMbufDisplayImageBuffersReq 8
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufSetMBufferAttributes */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
- CARD32 valueMask B32; /* modified entries */
+ CARD16 length;
+ CARD32 window; /* associated window */
+ CARD32 valueMask; /* modified entries */
} xMbufSetMBufferAttributesReq; /* followed by values */
#define sz_xMbufSetMBufferAttributesReq 12
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufGetMBufferAttributes */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
+ CARD16 length;
+ CARD32 window; /* associated window */
} xMbufGetMBufferAttributesReq;
#define sz_xMbufGetMBufferAttributesReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 displayedBuffer B16; /* currently visible buffer */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 displayedBuffer; /* currently visible buffer */
CARD8 updateAction;
CARD8 updateHint;
CARD8 windowMode;
CARD8 unused0;
- CARD16 unused1 B16;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
+ CARD16 unused1;
+ CARD32 unused2;
+ CARD32 unused3;
+ CARD32 unused4;
+ CARD32 unused5;
} xMbufGetMBufferAttributesReply;
#define sz_xMbufGetMBufferAttributesReply 32
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufSetBufferAttributes */
- CARD16 length B16;
- CARD32 buffer B32;
- CARD32 valueMask B32;
+ CARD16 length;
+ CARD32 buffer;
+ CARD32 valueMask;
} xMbufSetBufferAttributesReq; /* followed by values */
#define sz_xMbufSetBufferAttributesReq 12
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufGetBufferAttributes */
- CARD16 length B16;
- CARD32 buffer B32;
+ CARD16 length;
+ CARD32 buffer;
} xMbufGetBufferAttributesReq;
#define sz_xMbufGetBufferAttributesReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 eventMask B32;
- CARD16 bufferIndex B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 window;
+ CARD32 eventMask;
+ CARD16 bufferIndex;
CARD8 side;
CARD8 unused0;
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
+ CARD32 unused1;
+ CARD32 unused2;
+ CARD32 unused3;
} xMbufGetBufferAttributesReply;
#define sz_xMbufGetBufferAttributesReply 32
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufGetBufferInfo */
- CARD16 length B16;
- Drawable drawable B32;
+ CARD16 length;
+ Drawable drawable;
} xMbufGetBufferInfoReq;
#define sz_xMbufGetBufferInfoReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 normalInfo B16;
- CARD16 stereoInfo B16;
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 normalInfo;
+ CARD16 stereoInfo;
+ CARD32 unused1;
+ CARD32 unused2;
+ CARD32 unused3;
+ CARD32 unused4;
+ CARD32 unused5;
} xMbufGetBufferInfoReply; /* followed by buffer infos */
#define sz_xMbufGetBufferInfoReply 32
@@ -247,39 +247,39 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufCreateStereoWindow */
- CARD16 length B16;
+ CARD16 length;
CARD8 unused0;
CARD8 unused1;
CARD8 unused2;
CARD8 depth;
- Window wid B32;
- Window parent B32;
- Multibuffer left B32; /* associated buffers */
- Multibuffer right B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 borderWidth B16;
+ Window wid;
+ Window parent;
+ Multibuffer left; /* associated buffers */
+ Multibuffer right;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD16 borderWidth;
#if defined(__cplusplus) || defined(c_plusplus)
- CARD16 c_class B16;
+ CARD16 c_class;
#else
- CARD16 class B16;
+ CARD16 class;
#endif
- VisualID visual B32;
- CARD32 mask B32;
+ VisualID visual;
+ CARD32 mask;
} xMbufCreateStereoWindowReq; /* followed by value list */
#define sz_xMbufCreateStereoWindowReq 44
typedef struct {
CARD8 reqType; /* always codes->major_opcode */
CARD8 mbufReqType; /* always X_MbufClearImageBufferArea */
- CARD16 length B16;
- Multibuffer buffer B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ Multibuffer buffer;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
CARD8 unused0;
CARD8 unused1;
CARD8 unused2;
diff --git a/include/X11/extensions/panoramiXproto.h b/include/X11/extensions/panoramiXproto.h
index ee1c246..5de1cf0 100644
--- a/include/X11/extensions/panoramiXproto.h
+++ b/include/X11/extensions/panoramiXproto.h
@@ -44,10 +44,10 @@ Equipment Corporation.
typedef struct _PanoramiXQueryVersion {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */
- CARD16 length B16;
+ CARD16 length;
CARD8 clientMajor;
CARD8 clientMinor;
- CARD16 unused B16;
+ CARD16 unused;
} xPanoramiXQueryVersionReq;
#define sz_xPanoramiXQueryVersionReq 8
@@ -55,15 +55,15 @@ typedef struct _PanoramiXQueryVersion {
typedef struct {
CARD8 type; /* must be X_Reply */
CARD8 pad1; /* unused */
- CARD16 sequenceNumber B16; /* last sequence number */
- CARD32 length B32; /* 0 */
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
- CARD32 pad6 B32; /* unused */
+ CARD16 sequenceNumber; /* last sequence number */
+ CARD32 length; /* 0 */
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
+ CARD32 pad6; /* unused */
} xPanoramiXQueryVersionReply;
#define sz_xPanoramiXQueryVersionReply 32
@@ -72,22 +72,22 @@ typedef struct {
typedef struct _PanoramiXGetState {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetState */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xPanoramiXGetStateReq;
#define sz_xPanoramiXGetStateReq 8
typedef struct {
BYTE type;
BYTE state;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 window;
+ CARD32 pad1; /* unused */
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
} xPanoramiXGetStateReply;
#define sz_panoramiXGetStateReply 32
@@ -95,45 +95,45 @@ typedef struct {
typedef struct _PanoramiXGetScreenCount {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetScreenCount */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xPanoramiXGetScreenCountReq;
#define sz_xPanoramiXGetScreenCountReq 8
typedef struct {
BYTE type;
BYTE ScreenCount;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 window;
+ CARD32 pad1; /* unused */
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
} xPanoramiXGetScreenCountReply;
#define sz_panoramiXGetScreenCountReply 32
typedef struct _PanoramiXGetScreenSize {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetState */
- CARD16 length B16;
- CARD32 window B32;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 window;
+ CARD32 screen;
} xPanoramiXGetScreenSizeReq;
#define sz_xPanoramiXGetScreenSizeReq 12
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 window B32;
- CARD32 screen B32;
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 width;
+ CARD32 height;
+ CARD32 window;
+ CARD32 screen;
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
} xPanoramiXGetScreenSizeReply;
#define sz_panoramiXGetScreenSizeReply 32
@@ -142,21 +142,21 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 panoramiXReqType;
- CARD16 length B16;
+ CARD16 length;
} xXineramaIsActiveReq;
#define sz_xXineramaIsActiveReq 4
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 state B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 state;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXineramaIsActiveReply;
#define sz_XineramaIsActiveReply 32
@@ -164,29 +164,29 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 panoramiXReqType;
- CARD16 length B16;
+ CARD16 length;
} xXineramaQueryScreensReq;
#define sz_xXineramaQueryScreensReq 4
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 number B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 number;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXineramaQueryScreensReply;
#define sz_XineramaQueryScreensReply 32
typedef struct {
- INT16 x_org B16;
- INT16 y_org B16;
- CARD16 width B16;
- CARD16 height B16;
+ INT16 x_org;
+ INT16 y_org;
+ CARD16 width;
+ CARD16 height;
} xXineramaScreenInfo;
#define sz_XineramaScreenInfo 8
diff --git a/include/X11/extensions/presentproto.h b/include/X11/extensions/presentproto.h
index eb2bb96..d8dc6d2 100644
--- a/include/X11/extensions/presentproto.h
+++ b/include/X11/extensions/presentproto.h
@@ -32,55 +32,55 @@
#define EventID CARD32
typedef struct {
- Window window B32;
- CARD32 serial B32;
+ Window window;
+ CARD32 serial;
} xPresentNotify;
#define sz_xPresentNotify 8
typedef struct {
CARD8 reqType;
CARD8 presentReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xPresentQueryVersionReq;
#define sz_xPresentQueryVersionReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xPresentQueryVersionReply;
#define sz_xPresentQueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 presentReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
- Pixmap pixmap B32;
- CARD32 serial B32;
+ Pixmap pixmap;
+ CARD32 serial;
- Region valid B32;
- Region update B32;
+ Region valid;
+ Region update;
- INT16 x_off B16;
- INT16 y_off B16;
- CARD32 target_crtc B32;
+ INT16 x_off;
+ INT16 y_off;
+ CARD32 target_crtc;
- XSyncFence wait_fence B32;
- XSyncFence idle_fence B32;
+ XSyncFence wait_fence;
+ XSyncFence idle_fence;
- CARD32 options B32;
- CARD32 pad1 B32;
+ CARD32 options;
+ CARD32 pad1;
CARD64 target_msc;
CARD64 divisor;
@@ -92,11 +92,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 presentReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
- CARD32 serial B32;
- CARD32 pad0 B32;
+ CARD32 serial;
+ CARD32 pad0;
CARD64 target_msc;
CARD64 divisor;
@@ -107,32 +107,32 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 presentReqType;
- CARD16 length B16;
- CARD32 eid B32;
- CARD32 window B32;
- CARD32 eventMask B32;
+ CARD16 length;
+ CARD32 eid;
+ CARD32 window;
+ CARD32 eventMask;
} xPresentSelectInputReq;
#define sz_xPresentSelectInputReq 16
typedef struct {
CARD8 reqType;
CARD8 presentReqType;
- CARD16 length B16;
- CARD32 target B32;
+ CARD16 length;
+ CARD32 target;
} xPresentQueryCapabilitiesReq;
#define sz_xPresentQueryCapabilitiesReq 8
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 capabilities B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 capabilities;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xPresentQueryCapabilitiesReply;
#define sz_xPresentQueryCapabilitiesReply 32
@@ -145,36 +145,36 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 extension;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 length;
- CARD16 evtype B16;
+ CARD16 evtype;
CARD16 pad2;
- CARD32 eid B32;
- CARD32 window B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- INT16 off_x B16;
- INT16 off_y B16;
-
- CARD16 pixmap_width B16;
- CARD16 pixmap_height B16;
- CARD32 pixmap_flags B32;
+ CARD32 eid;
+ CARD32 window;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ INT16 off_x;
+ INT16 off_y;
+
+ CARD16 pixmap_width;
+ CARD16 pixmap_height;
+ CARD32 pixmap_flags;
} xPresentConfigureNotify;
#define sz_xPresentConfigureNotify 40
typedef struct {
CARD8 type;
CARD8 extension;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 length;
- CARD16 evtype B16;
+ CARD16 evtype;
CARD8 kind;
CARD8 mode;
- CARD32 eid B32;
- Window window B32;
- CARD32 serial B32;
+ CARD32 eid;
+ Window window;
+ CARD32 serial;
CARD64 ust;
CARD64 msc;
@@ -184,15 +184,15 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 extension;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 length;
- CARD16 evtype B16;
- CARD16 pad2 B16;
- CARD32 eid B32;
- Window window B32;
- CARD32 serial B32;
- Pixmap pixmap B32;
- CARD32 idle_fence B32;
+ CARD16 evtype;
+ CARD16 pad2;
+ CARD32 eid;
+ Window window;
+ CARD32 serial;
+ Pixmap pixmap;
+ CARD32 idle_fence;
} xPresentIdleNotify;
#define sz_xPresentIdleNotify 32
@@ -200,35 +200,35 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 extension;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 length;
- CARD16 evtype B16;
+ CARD16 evtype;
CARD8 update_window;
CARD8 pad1;
- CARD32 eid B32;
- Window event_window B32;
- Window window B32;
- Pixmap pixmap B32;
- CARD32 serial B32;
+ CARD32 eid;
+ Window event_window;
+ Window window;
+ Pixmap pixmap;
+ CARD32 serial;
/* 32-byte boundary */
- Region valid_region B32;
- Region update_region B32;
+ Region valid_region;
+ Region update_region;
xRectangle valid_rect;
xRectangle update_rect;
- INT16 x_off B16;
- INT16 y_off B16;
- CARD32 target_crtc B32;
+ INT16 x_off;
+ INT16 y_off;
+ CARD32 target_crtc;
- XSyncFence wait_fence B32;
- XSyncFence idle_fence B32;
+ XSyncFence wait_fence;
+ XSyncFence idle_fence;
- CARD32 options B32;
- CARD32 pad2 B32;
+ CARD32 options;
+ CARD32 pad2;
CARD64 target_msc;
CARD64 divisor;
diff --git a/include/X11/extensions/randrproto.h b/include/X11/extensions/randrproto.h
index 0966b4b..624c254 100644
--- a/include/X11/extensions/randrproto.h
+++ b/include/X11/extensions/randrproto.h
@@ -61,10 +61,10 @@
*/
typedef struct {
- CARD16 widthInPixels B16;
- CARD16 heightInPixels B16;
- CARD16 widthInMillimeters B16;
- CARD16 heightInMillimeters B16;
+ CARD16 widthInPixels;
+ CARD16 heightInPixels;
+ CARD16 widthInMillimeters;
+ CARD16 heightInMillimeters;
} xScreenSizes;
#define sz_xScreenSizes 8
@@ -75,31 +75,31 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xRRQueryVersionReq;
#define sz_xRRQueryVersionReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRQueryVersionReply;
#define sz_xRRQueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xRRGetScreenInfoReq;
#define sz_xRRGetScreenInfoReq 8
@@ -113,68 +113,68 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE setOfRotations;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Window root B32;
- Time timestamp B32;
- Time configTimestamp B32;
- CARD16 nSizes B16;
- SizeID sizeID B16;
- Rotation rotation B16;
- CARD16 rate B16;
- CARD16 nrateEnts B16;
- CARD16 pad B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Window root;
+ Time timestamp;
+ Time configTimestamp;
+ CARD16 nSizes;
+ SizeID sizeID;
+ Rotation rotation;
+ CARD16 rate;
+ CARD16 nrateEnts;
+ CARD16 pad;
} xRRGetScreenInfoReply;
#define sz_xRRGetScreenInfoReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Drawable drawable B32;
- Time timestamp B32;
- Time configTimestamp B32;
- SizeID sizeID B16;
- Rotation rotation B16;
+ CARD16 length;
+ Drawable drawable;
+ Time timestamp;
+ Time configTimestamp;
+ SizeID sizeID;
+ Rotation rotation;
} xRR1_0SetScreenConfigReq;
#define sz_xRR1_0SetScreenConfigReq 20
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Drawable drawable B32;
- Time timestamp B32;
- Time configTimestamp B32;
- SizeID sizeID B16;
- Rotation rotation B16;
- CARD16 rate B16;
- CARD16 pad B16;
+ CARD16 length;
+ Drawable drawable;
+ Time timestamp;
+ Time configTimestamp;
+ SizeID sizeID;
+ Rotation rotation;
+ CARD16 rate;
+ CARD16 pad;
} xRRSetScreenConfigReq;
#define sz_xRRSetScreenConfigReq 24
typedef struct {
BYTE type; /* X_Reply */
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time newTimestamp B32;
- Time newConfigTimestamp B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time newTimestamp;
+ Time newConfigTimestamp;
Window root;
- CARD16 subpixelOrder B16;
- CARD16 pad4 B16;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 subpixelOrder;
+ CARD16 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRRSetScreenConfigReply;
#define sz_xRRSetScreenConfigReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
- CARD16 enable B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ Window window;
+ CARD16 enable;
+ CARD16 pad2;
} xRRSelectInputReq;
#define sz_xRRSelectInputReq 12
@@ -183,232 +183,232 @@ typedef struct {
*/
typedef struct _xRRModeInfo {
- RRMode id B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 dotClock B32;
- CARD16 hSyncStart B16;
- CARD16 hSyncEnd B16;
- CARD16 hTotal B16;
- CARD16 hSkew B16;
- CARD16 vSyncStart B16;
- CARD16 vSyncEnd B16;
- CARD16 vTotal B16;
- CARD16 nameLength B16;
- RRModeFlags modeFlags B32;
+ RRMode id;
+ CARD16 width;
+ CARD16 height;
+ CARD32 dotClock;
+ CARD16 hSyncStart;
+ CARD16 hSyncEnd;
+ CARD16 hTotal;
+ CARD16 hSkew;
+ CARD16 vSyncStart;
+ CARD16 vSyncEnd;
+ CARD16 vTotal;
+ CARD16 nameLength;
+ RRModeFlags modeFlags;
} xRRModeInfo;
#define sz_xRRModeInfo 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xRRGetScreenSizeRangeReq;
#define sz_xRRGetScreenSizeRangeReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 minWidth B16;
- CARD16 minHeight B16;
- CARD16 maxWidth B16;
- CARD16 maxHeight B16;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 minWidth;
+ CARD16 minHeight;
+ CARD16 maxWidth;
+ CARD16 maxHeight;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xRRGetScreenSizeRangeReply;
#define sz_xRRGetScreenSizeRangeReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 widthInMillimeters B32;
- CARD32 heightInMillimeters B32;
+ CARD16 length;
+ Window window;
+ CARD16 width;
+ CARD16 height;
+ CARD32 widthInMillimeters;
+ CARD32 heightInMillimeters;
} xRRSetScreenSizeReq;
#define sz_xRRSetScreenSizeReq 20
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xRRGetScreenResourcesReq;
#define sz_xRRGetScreenResourcesReq 8
typedef struct {
BYTE type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- Time configTimestamp B32;
- CARD16 nCrtcs B16;
- CARD16 nOutputs B16;
- CARD16 nModes B16;
- CARD16 nbytesNames B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ Time configTimestamp;
+ CARD16 nCrtcs;
+ CARD16 nOutputs;
+ CARD16 nModes;
+ CARD16 nbytesNames;
+ CARD32 pad1;
+ CARD32 pad2;
} xRRGetScreenResourcesReply;
#define sz_xRRGetScreenResourcesReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Time configTimestamp B32;
+ CARD16 length;
+ RROutput output;
+ Time configTimestamp;
} xRRGetOutputInfoReq;
#define sz_xRRGetOutputInfoReq 12
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- RRCrtc crtc B32;
- CARD32 mmWidth B32;
- CARD32 mmHeight B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ RRCrtc crtc;
+ CARD32 mmWidth;
+ CARD32 mmHeight;
CARD8 connection;
CARD8 subpixelOrder;
- CARD16 nCrtcs B16;
- CARD16 nModes B16;
- CARD16 nPreferred B16;
- CARD16 nClones B16;
- CARD16 nameLength B16;
+ CARD16 nCrtcs;
+ CARD16 nModes;
+ CARD16 nPreferred;
+ CARD16 nClones;
+ CARD16 nameLength;
} xRRGetOutputInfoReply;
#define sz_xRRGetOutputInfoReply 36
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
+ CARD16 length;
+ RROutput output;
} xRRListOutputPropertiesReq;
#define sz_xRRListOutputPropertiesReq 8
typedef struct {
BYTE type;
CARD8 pad0;
- 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;
} xRRListOutputPropertiesReply;
#define sz_xRRListOutputPropertiesReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Atom property B32;
+ CARD16 length;
+ RROutput output;
+ Atom property;
} xRRQueryOutputPropertyReq;
#define sz_xRRQueryOutputPropertyReq 12
typedef struct {
BYTE type;
BYTE pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL pending;
BOOL range;
BOOL immutable;
BYTE pad1;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRRQueryOutputPropertyReply;
#define sz_xRRQueryOutputPropertyReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Atom property B32;
+ CARD16 length;
+ RROutput output;
+ Atom property;
BOOL pending;
BOOL range;
- CARD16 pad B16;
+ CARD16 pad;
} xRRConfigureOutputPropertyReq;
#define sz_xRRConfigureOutputPropertyReq 16
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Atom property B32;
- Atom type B32;
+ CARD16 length;
+ RROutput output;
+ Atom property;
+ Atom type;
CARD8 format;
CARD8 mode;
CARD16 pad;
- CARD32 nUnits B32;
+ CARD32 nUnits;
} xRRChangeOutputPropertyReq;
#define sz_xRRChangeOutputPropertyReq 24
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Atom property B32;
+ CARD16 length;
+ RROutput output;
+ Atom property;
} xRRDeleteOutputPropertyReq;
#define sz_xRRDeleteOutputPropertyReq 12
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- Atom property B32;
- Atom type B32;
- CARD32 longOffset B32;
- CARD32 longLength B32;
+ CARD16 length;
+ RROutput output;
+ Atom property;
+ Atom type;
+ CARD32 longOffset;
+ CARD32 longLength;
#ifdef __cplusplus
BOOL _delete;
#else
BOOL delete;
#endif
BOOL pending;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xRRGetOutputPropertyReq;
#define sz_xRRGetOutputPropertyReq 28
typedef struct {
BYTE type;
CARD8 format;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom propertyType;
+ CARD32 bytesAfter;
+ CARD32 nItems;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xRRGetOutputPropertyReply;
#define sz_xRRGetOutputPropertyReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
xRRModeInfo modeInfo;
} xRRCreateModeReq;
#define sz_xRRCreateModeReq 40
@@ -416,152 +416,152 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- RRMode mode B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ RRMode mode;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRCreateModeReply;
#define sz_xRRCreateModeReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRMode mode B32;
+ CARD16 length;
+ RRMode mode;
} xRRDestroyModeReq;
#define sz_xRRDestroyModeReq 8
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- RRMode mode B32;
+ CARD16 length;
+ RROutput output;
+ RRMode mode;
} xRRAddOutputModeReq;
#define sz_xRRAddOutputModeReq 12
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RROutput output B32;
- RRMode mode B32;
+ CARD16 length;
+ RROutput output;
+ RRMode mode;
} xRRDeleteOutputModeReq;
#define sz_xRRDeleteOutputModeReq 12
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
- Time configTimestamp B32;
+ CARD16 length;
+ RRCrtc crtc;
+ Time configTimestamp;
} xRRGetCrtcInfoReq;
#define sz_xRRGetCrtcInfoReq 12
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- RRMode mode B32;
- Rotation rotation B16;
- Rotation rotations B16;
- CARD16 nOutput B16;
- CARD16 nPossibleOutput B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ RRMode mode;
+ Rotation rotation;
+ Rotation rotations;
+ CARD16 nOutput;
+ CARD16 nPossibleOutput;
} xRRGetCrtcInfoReply;
#define sz_xRRGetCrtcInfoReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
- Time timestamp B32;
- Time configTimestamp B32;
- INT16 x B16;
- INT16 y B16;
- RRMode mode B32;
- Rotation rotation B16;
- CARD16 pad B16;
+ CARD16 length;
+ RRCrtc crtc;
+ Time timestamp;
+ Time configTimestamp;
+ INT16 x;
+ INT16 y;
+ RRMode mode;
+ Rotation rotation;
+ CARD16 pad;
} xRRSetCrtcConfigReq;
#define sz_xRRSetCrtcConfigReq 28
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time newTimestamp B32;
- CARD32 pad1 B32;
- CARD32 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time newTimestamp;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRSetCrtcConfigReply;
#define sz_xRRSetCrtcConfigReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
+ CARD16 length;
+ RRCrtc crtc;
} xRRGetCrtcGammaSizeReq;
#define sz_xRRGetCrtcGammaSizeReq 8
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 size;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRRGetCrtcGammaSizeReply;
#define sz_xRRGetCrtcGammaSizeReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
+ CARD16 length;
+ RRCrtc crtc;
} xRRGetCrtcGammaReq;
#define sz_xRRGetCrtcGammaReq 8
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 size;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRRGetCrtcGammaReply;
#define sz_xRRGetCrtcGammaReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
- CARD16 size B16;
- CARD16 pad1 B16;
+ CARD16 length;
+ RRCrtc crtc;
+ CARD16 size;
+ CARD16 pad1;
} xRRSetCrtcGammaReq;
#define sz_xRRSetCrtcGammaReq 12
@@ -579,11 +579,11 @@ typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply;
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
+ CARD16 length;
+ RRCrtc crtc;
xRenderTransform transform;
CARD16 nbytesFilter; /* number of bytes in filter name */
- CARD16 pad B16;
+ CARD16 pad;
} xRRSetCrtcTransformReq;
#define sz_xRRSetCrtcTransformReq 48
@@ -591,8 +591,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
+ CARD16 length;
+ RRCrtc crtc;
} xRRGetCrtcTransformReq;
#define sz_xRRGetCrtcTransformReq 8
@@ -600,18 +600,18 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
xRenderTransform pendingTransform;
BYTE hasTransforms;
CARD8 pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
xRenderTransform currentTransform;
- CARD32 pad2 B32;
- CARD16 pendingNbytesFilter B16; /* number of bytes in filter name */
- CARD16 pendingNparamsFilter B16; /* number of filter params */
- CARD16 currentNbytesFilter B16; /* number of bytes in filter name */
- CARD16 currentNparamsFilter B16; /* number of filter params */
+ CARD32 pad2;
+ CARD16 pendingNbytesFilter; /* number of bytes in filter name */
+ CARD16 pendingNparamsFilter; /* number of filter params */
+ CARD16 currentNbytesFilter; /* number of bytes in filter name */
+ CARD16 currentNparamsFilter; /* number of filter params */
} xRRGetCrtcTransformReply;
#define sz_xRRGetCrtcTransformReply 96
@@ -619,31 +619,31 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
- RROutput output B32;
+ CARD16 length;
+ Window window;
+ RROutput output;
} xRRSetOutputPrimaryReq;
#define sz_xRRSetOutputPrimaryReq 12
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xRRGetOutputPrimaryReq;
#define sz_xRRGetOutputPrimaryReq 8
typedef struct {
BYTE type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- RROutput output B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ RROutput output;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRGetOutputPrimaryReply;
#define sz_xRRGetOutputPrimaryReply 32
@@ -654,185 +654,185 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xRRGetProvidersReq;
#define sz_xRRGetProvidersReq 8
typedef struct {
BYTE type;
CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
CARD16 nProviders;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRGetProvidersReply;
#define sz_xRRGetProvidersReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Time configTimestamp B32;
+ CARD16 length;
+ RRProvider provider;
+ Time configTimestamp;
} xRRGetProviderInfoReq;
#define sz_xRRGetProviderInfoReq 12
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- CARD32 capabilities B32;
- CARD16 nCrtcs B16;
- CARD16 nOutputs B16;
- CARD16 nAssociatedProviders B16;
- CARD16 nameLength B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ CARD32 capabilities;
+ CARD16 nCrtcs;
+ CARD16 nOutputs;
+ CARD16 nAssociatedProviders;
+ CARD16 nameLength;
+ CARD32 pad1;
+ CARD32 pad2;
} xRRGetProviderInfoReply;
#define sz_xRRGetProviderInfoReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- RRProvider source_provider B32;
- Time configTimestamp B32;
+ CARD16 length;
+ RRProvider provider;
+ RRProvider source_provider;
+ Time configTimestamp;
} xRRSetProviderOutputSourceReq;
#define sz_xRRSetProviderOutputSourceReq 16
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- RRProvider sink_provider B32;
- Time configTimestamp B32;
+ CARD16 length;
+ RRProvider provider;
+ RRProvider sink_provider;
+ Time configTimestamp;
} xRRSetProviderOffloadSinkReq;
#define sz_xRRSetProviderOffloadSinkReq 16
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
+ CARD16 length;
+ RRProvider provider;
} xRRListProviderPropertiesReq;
#define sz_xRRListProviderPropertiesReq 8
typedef struct {
BYTE type;
CARD8 pad0;
- 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;
} xRRListProviderPropertiesReply;
#define sz_xRRListProviderPropertiesReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Atom property B32;
+ CARD16 length;
+ RRProvider provider;
+ Atom property;
} xRRQueryProviderPropertyReq;
#define sz_xRRQueryProviderPropertyReq 12
typedef struct {
BYTE type;
BYTE pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL pending;
BOOL range;
BOOL immutable;
BYTE pad1;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRRQueryProviderPropertyReply;
#define sz_xRRQueryProviderPropertyReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Atom property B32;
+ CARD16 length;
+ RRProvider provider;
+ Atom property;
BOOL pending;
BOOL range;
- CARD16 pad B16;
+ CARD16 pad;
} xRRConfigureProviderPropertyReq;
#define sz_xRRConfigureProviderPropertyReq 16
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Atom property B32;
- Atom type B32;
+ CARD16 length;
+ RRProvider provider;
+ Atom property;
+ Atom type;
CARD8 format;
CARD8 mode;
CARD16 pad;
- CARD32 nUnits B32;
+ CARD32 nUnits;
} xRRChangeProviderPropertyReq;
#define sz_xRRChangeProviderPropertyReq 24
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Atom property B32;
+ CARD16 length;
+ RRProvider provider;
+ Atom property;
} xRRDeleteProviderPropertyReq;
#define sz_xRRDeleteProviderPropertyReq 12
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRProvider provider B32;
- Atom property B32;
- Atom type B32;
- CARD32 longOffset B32;
- CARD32 longLength B32;
+ CARD16 length;
+ RRProvider provider;
+ Atom property;
+ Atom type;
+ CARD32 longOffset;
+ CARD32 longLength;
#ifdef __cplusplus
BOOL _delete;
#else
BOOL delete;
#endif
BOOL pending;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xRRGetProviderPropertyReq;
#define sz_xRRGetProviderPropertyReq 28
typedef struct {
BYTE type;
CARD8 format;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom propertyType;
+ CARD32 bytesAfter;
+ CARD32 nItems;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xRRGetProviderPropertyReply;
#define sz_xRRGetProviderPropertyReply 32
@@ -843,36 +843,36 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
- RRLease lid B32;
- CARD16 nCrtcs B16;
- CARD16 nOutputs B16;
+ CARD16 length;
+ Window window;
+ RRLease lid;
+ CARD16 nCrtcs;
+ CARD16 nOutputs;
} xRRCreateLeaseReq;
#define sz_xRRCreateLeaseReq 16
typedef struct {
BYTE type;
CARD8 nfd;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xRRCreateLeaseReply;
#define sz_xRRCreateLeaseReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRLease lid B32;
+ CARD16 length;
+ RRLease lid;
BYTE terminate;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xRRFreeLeaseReq;
#define sz_xRRFreeLeaseReq 12
@@ -882,48 +882,48 @@ typedef struct {
typedef struct {
CARD8 type; /* always evBase + ScreenChangeNotify */
CARD8 rotation; /* new rotation */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time screen was changed */
- Time configTimestamp B32; /* time config data was changed */
- Window root B32; /* root window */
- Window window B32; /* window requesting notification */
- SizeID sizeID B16; /* new size ID */
- CARD16 subpixelOrder B16; /* subpixel order */
- CARD16 widthInPixels B16; /* new size */
- CARD16 heightInPixels B16;
- CARD16 widthInMillimeters B16;
- CARD16 heightInMillimeters B16;
+ CARD16 sequenceNumber;
+ Time timestamp; /* time screen was changed */
+ Time configTimestamp; /* time config data was changed */
+ Window root; /* root window */
+ Window window; /* window requesting notification */
+ SizeID sizeID; /* new size ID */
+ CARD16 subpixelOrder; /* subpixel order */
+ CARD16 widthInPixels; /* new size */
+ CARD16 heightInPixels;
+ CARD16 widthInMillimeters;
+ CARD16 heightInMillimeters;
} xRRScreenChangeNotifyEvent;
#define sz_xRRScreenChangeNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_CrtcChange */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time crtc was changed */
- Window window B32; /* window requesting notification */
- RRCrtc crtc B32; /* affected CRTC */
- RRMode mode B32; /* current mode */
- CARD16 rotation B16; /* rotation and reflection */
- CARD16 pad1 B16; /* unused */
- INT16 x B16; /* new location */
- INT16 y B16;
- CARD16 width B16; /* new size */
- CARD16 height B16;
+ CARD16 sequenceNumber;
+ Time timestamp; /* time crtc was changed */
+ Window window; /* window requesting notification */
+ RRCrtc crtc; /* affected CRTC */
+ RRMode mode; /* current mode */
+ CARD16 rotation; /* rotation and reflection */
+ CARD16 pad1; /* unused */
+ INT16 x; /* new location */
+ INT16 y;
+ CARD16 width; /* new size */
+ CARD16 height;
} xRRCrtcChangeNotifyEvent;
#define sz_xRRCrtcChangeNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_OutputChange */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time output was changed */
- Time configTimestamp B32; /* time config was changed */
- Window window B32; /* window requesting notification */
- RROutput output B32; /* affected output */
- RRCrtc crtc B32; /* current crtc */
- RRMode mode B32; /* current mode */
- CARD16 rotation B16; /* rotation and reflection */
+ CARD16 sequenceNumber;
+ Time timestamp; /* time output was changed */
+ Time configTimestamp; /* time config was changed */
+ Window window; /* window requesting notification */
+ RROutput output; /* affected output */
+ RRCrtc crtc; /* current crtc */
+ RRMode mode; /* current mode */
+ CARD16 rotation; /* rotation and reflection */
CARD8 connection; /* connection status */
CARD8 subpixelOrder; /* subpixel order */
} xRROutputChangeNotifyEvent;
@@ -932,162 +932,162 @@ typedef struct {
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_OutputProperty */
- CARD16 sequenceNumber B16;
- Window window B32; /* window requesting notification */
- RROutput output B32; /* affected output */
- Atom atom B32; /* property name */
- Time timestamp B32; /* time crtc was changed */
+ CARD16 sequenceNumber;
+ Window window; /* window requesting notification */
+ RROutput output; /* affected output */
+ Atom atom; /* property name */
+ Time timestamp; /* time crtc was changed */
CARD8 state; /* NewValue or Deleted */
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xRROutputPropertyNotifyEvent;
#define sz_xRROutputPropertyNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_ProviderChange */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time provider was changed */
- Window window B32; /* window requesting notification */
- RRProvider provider B32; /* affected provider */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ Time timestamp; /* time provider was changed */
+ Window window; /* window requesting notification */
+ RRProvider provider; /* affected provider */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xRRProviderChangeNotifyEvent;
#define sz_xRRProviderChangeNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_ProviderProperty */
- CARD16 sequenceNumber B16;
- Window window B32; /* window requesting notification */
- RRProvider provider B32; /* affected provider */
- Atom atom B32; /* property name */
- Time timestamp B32; /* time provider was changed */
+ CARD16 sequenceNumber;
+ Window window; /* window requesting notification */
+ RRProvider provider; /* affected provider */
+ Atom atom; /* property name */
+ Time timestamp; /* time provider was changed */
CARD8 state; /* NewValue or Deleted */
CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xRRProviderPropertyNotifyEvent;
#define sz_xRRProviderPropertyNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_ResourceChange */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time resource was changed */
- Window window B32; /* window requesting notification */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ Time timestamp; /* time resource was changed */
+ Window window; /* window requesting notification */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRResourceChangeNotifyEvent;
#define sz_xRRResourceChangeNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
CARD8 subCode; /* RRNotify_Lease */
- CARD16 sequenceNumber B16;
- Time timestamp B32; /* time resource was changed */
- Window window B32; /* window requesting notification */
- RRLease lease B32;
+ CARD16 sequenceNumber;
+ Time timestamp; /* time resource was changed */
+ Window window; /* window requesting notification */
+ RRLease lease;
CARD8 created; /* created/deleted */
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xRRLeaseNotifyEvent;
#define sz_xRRLeaseNotifyEvent 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
+ CARD16 length;
+ RRCrtc crtc;
} xRRGetPanningReq;
#define sz_xRRGetPanningReq 8
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- CARD16 left B16;
- CARD16 top B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 track_left B16;
- CARD16 track_top B16;
- CARD16 track_width B16;
- CARD16 track_height B16;
- INT16 border_left B16;
- INT16 border_top B16;
- INT16 border_right B16;
- INT16 border_bottom B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ CARD16 left;
+ CARD16 top;
+ CARD16 width;
+ CARD16 height;
+ CARD16 track_left;
+ CARD16 track_top;
+ CARD16 track_width;
+ CARD16 track_height;
+ INT16 border_left;
+ INT16 border_top;
+ INT16 border_right;
+ INT16 border_bottom;
} xRRGetPanningReply;
#define sz_xRRGetPanningReply 36
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- RRCrtc crtc B32;
- Time timestamp B32;
- CARD16 left B16;
- CARD16 top B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 track_left B16;
- CARD16 track_top B16;
- CARD16 track_width B16;
- CARD16 track_height B16;
- INT16 border_left B16;
- INT16 border_top B16;
- INT16 border_right B16;
- INT16 border_bottom B16;
+ CARD16 length;
+ RRCrtc crtc;
+ Time timestamp;
+ CARD16 left;
+ CARD16 top;
+ CARD16 width;
+ CARD16 height;
+ CARD16 track_left;
+ CARD16 track_top;
+ CARD16 track_width;
+ CARD16 track_height;
+ INT16 border_left;
+ INT16 border_top;
+ INT16 border_right;
+ INT16 border_bottom;
} xRRSetPanningReq;
#define sz_xRRSetPanningReq 36
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time newTimestamp B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time newTimestamp;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRRSetPanningReply;
#define sz_xRRSetPanningReply 32
typedef struct {
- Atom name B32;
+ Atom name;
BOOL primary;
BOOL automatic;
- CARD16 noutput B16;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 widthInMillimeters B32;
- CARD32 heightInMillimeters B32;
+ CARD16 noutput;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD32 widthInMillimeters;
+ CARD32 heightInMillimeters;
} xRRMonitorInfo;
#define sz_xRRMonitorInfo 24
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
BOOL get_active;
CARD8 pad;
CARD16 pad2;
@@ -1097,22 +1097,22 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 status;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Time timestamp B32;
- CARD32 nmonitors B32;
- CARD32 noutputs B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Time timestamp;
+ CARD32 nmonitors;
+ CARD32 noutputs;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xRRGetMonitorsReply;
#define sz_xRRGetMonitorsReply 32
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
xRRMonitorInfo monitor;
} xRRSetMonitorReq;
#define sz_xRRSetMonitorReq 32
@@ -1120,9 +1120,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 randrReqType;
- CARD16 length B16;
- Window window B32;
- Atom name B32;
+ CARD16 length;
+ Window window;
+ Atom name;
} xRRDeleteMonitorReq;
#define sz_xRRDeleteMonitorReq 12
diff --git a/include/X11/extensions/recordproto.h b/include/X11/extensions/recordproto.h
index 01bc952..d2016eb 100644
--- a/include/X11/extensions/recordproto.h
+++ b/include/X11/extensions/recordproto.h
@@ -72,8 +72,8 @@ typedef struct
typedef struct
{
- CARD16 first B16;
- CARD16 last B16;
+ CARD16 first;
+ CARD16 last;
} RECORD_RANGE16;
typedef struct
@@ -108,12 +108,12 @@ typedef struct
CARD8 coreRepliesLast;
CARD8 extRequestsMajorFirst;
CARD8 extRequestsMajorLast;
- CARD16 extRequestsMinorFirst B16;
- CARD16 extRequestsMinorLast B16;
+ CARD16 extRequestsMinorFirst;
+ CARD16 extRequestsMinorLast;
CARD8 extRepliesMajorFirst;
CARD8 extRepliesMajorLast;
- CARD16 extRepliesMinorFirst B16;
- CARD16 extRepliesMinorLast B16;
+ CARD16 extRepliesMinorFirst;
+ CARD16 extRepliesMinorLast;
CARD8 deliveredEventsFirst;
CARD8 deliveredEventsLast;
CARD8 deviceEventsFirst;
@@ -127,8 +127,8 @@ typedef struct
typedef struct
{
- RECORD_CLIENTSPEC clientResource B32;
- CARD32 nRanges B32;
+ RECORD_CLIENTSPEC clientResource;
+ CARD32 nRanges;
/* LISTofRECORDRANGE */
} RECORD_CLIENT_INFO;
@@ -140,9 +140,9 @@ typedef RECORD_CLIENT_INFO xRecordClientInfo;
typedef struct {
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xRecordQueryVersionReq;
#define sz_xRecordQueryVersionReq 8
@@ -150,15 +150,15 @@ typedef struct
{
CARD8 type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRecordQueryVersionReply;
#define sz_xRecordQueryVersionReply 32
@@ -169,13 +169,13 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
RECORD_ELEMENT_HEADER elementHeader;
CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 nRanges B32;
+ CARD16 pad0;
+ CARD32 nClients;
+ CARD32 nRanges;
/* LISTofRECORD_CLIENTSPEC */
/* LISTofRECORDRANGE */
} xRecordCreateContextReq;
@@ -188,13 +188,13 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
RECORD_ELEMENT_HEADER elementHeader;
CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 nRanges B32;
+ CARD16 pad0;
+ CARD32 nClients;
+ CARD32 nRanges;
/* LISTofRECORD_CLIENTSPEC */
/* LISTofRECORDRANGE */
} xRecordRegisterClientsReq;
@@ -207,9 +207,9 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
- CARD32 nClients B32;
+ CARD16 length;
+ RECORD_RC context;
+ CARD32 nClients;
/* LISTofRECORD_CLIENTSPEC */
} xRecordUnregisterClientsReq;
#define sz_xRecordUnregisterClientsReq 12
@@ -221,8 +221,8 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
} xRecordGetContextReq;
#define sz_xRecordGetContextReq 8
@@ -230,16 +230,16 @@ typedef struct
{
CARD8 type;
BOOL enabled;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
RECORD_ELEMENT_HEADER elementHeader;
CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad0;
+ CARD32 nClients;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
/* LISTofCLIENT_INFO */ /* intercepted-clients */
} xRecordGetContextReply;
#define sz_xRecordGetContextReply 32
@@ -251,8 +251,8 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
} xRecordEnableContextReq;
#define sz_xRecordEnableContextReq 8
@@ -260,16 +260,16 @@ typedef struct
{
CARD8 type;
CARD8 category;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
RECORD_ELEMENT_HEADER elementHeader;
BOOL clientSwapped;
- CARD16 pad1 B16;
- RECORD_XIDBASE idBase B32;
- CARD32 serverTime B32;
- CARD32 recordedSequenceNumber B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad1;
+ RECORD_XIDBASE idBase;
+ CARD32 serverTime;
+ CARD32 recordedSequenceNumber;
+ CARD32 pad3;
+ CARD32 pad4;
/* BYTE data; */
} xRecordEnableContextReply;
#define sz_xRecordEnableContextReply 32
@@ -281,8 +281,8 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
} xRecordDisableContextReq;
#define sz_xRecordDisableContextReq 8
@@ -293,8 +293,8 @@ typedef struct
{
CARD8 reqType;
CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
+ CARD16 length;
+ RECORD_RC context;
} xRecordFreeContextReq;
#define sz_xRecordFreeContextReq 8
diff --git a/include/X11/extensions/renderproto.h b/include/X11/extensions/renderproto.h
index b7b72c1..2cd06af 100644
--- a/include/X11/extensions/renderproto.h
+++ b/include/X11/extensions/renderproto.h
@@ -50,23 +50,23 @@
*/
typedef struct {
- CARD16 red B16;
- CARD16 redMask B16;
- CARD16 green B16;
- CARD16 greenMask B16;
- CARD16 blue B16;
- CARD16 blueMask B16;
- CARD16 alpha B16;
- CARD16 alphaMask B16;
+ CARD16 red;
+ CARD16 redMask;
+ CARD16 green;
+ CARD16 greenMask;
+ CARD16 blue;
+ CARD16 blueMask;
+ CARD16 alpha;
+ CARD16 alphaMask;
} xDirectFormat;
#define sz_xDirectFormat 16
typedef struct {
- PictFormat id B32;
+ PictFormat id;
CARD8 type;
CARD8 depth;
- CARD16 pad1 B16;
+ CARD16 pad1;
xDirectFormat direct;
Colormap colormap;
} xPictFormInfo;
@@ -83,41 +83,41 @@ typedef struct {
typedef struct {
CARD8 depth;
CARD8 pad1;
- CARD16 nPictVisuals B16;
- CARD32 pad2 B32;
+ CARD16 nPictVisuals;
+ CARD32 pad2;
} xPictDepth;
#define sz_xPictDepth 8
typedef struct {
- CARD32 nDepth B32;
- PictFormat fallback B32;
+ CARD32 nDepth;
+ PictFormat fallback;
} xPictScreen;
#define sz_xPictScreen 8
typedef struct {
- CARD32 pixel B32;
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
- CARD16 alpha B16;
+ CARD32 pixel;
+ CARD16 red;
+ CARD16 green;
+ CARD16 blue;
+ CARD16 alpha;
} xIndexValue;
#define sz_xIndexValue 12
typedef struct {
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
- CARD16 alpha B16;
+ CARD16 red;
+ CARD16 green;
+ CARD16 blue;
+ CARD16 alpha;
} xRenderColor;
#define sz_xRenderColor 8
typedef struct {
- Fixed x B32;
- Fixed y B32;
+ Fixed x;
+ Fixed y;
} xPointFixed;
#define sz_xPointFixed 8
@@ -136,8 +136,8 @@ typedef struct {
#define sz_xTriangle 24
typedef struct {
- Fixed top B32;
- Fixed bottom B32;
+ Fixed top;
+ Fixed bottom;
xLineFixed left;
xLineFixed right;
} xTrapezoid;
@@ -145,12 +145,12 @@ typedef struct {
#define sz_xTrapezoid 40
typedef struct {
- CARD16 width B16;
- CARD16 height B16;
- INT16 x B16;
- INT16 y B16;
- INT16 xOff B16;
- INT16 yOff B16;
+ CARD16 width;
+ CARD16 height;
+ INT16 x;
+ INT16 y;
+ INT16 xOff;
+ INT16 yOff;
} xGlyphInfo;
#define sz_xGlyphInfo 12
@@ -183,9 +183,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xRenderQueryVersionReq;
#define sz_xRenderQueryVersionReq 12
@@ -193,14 +193,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRenderQueryVersionReply;
#define sz_xRenderQueryVersionReply 32
@@ -208,7 +208,7 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
} xRenderQueryPictFormatsReq;
#define sz_xRenderQueryPictFormatsReq 4
@@ -216,14 +216,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numFormats B32;
- CARD32 numScreens B32;
- CARD32 numDepths B32;
- CARD32 numVisuals B32;
- CARD32 numSubpixel B32; /* Version 0.6 */
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numFormats;
+ CARD32 numScreens;
+ CARD32 numDepths;
+ CARD32 numVisuals;
+ CARD32 numSubpixel; /* Version 0.6 */
+ CARD32 pad5;
} xRenderQueryPictFormatsReply;
#define sz_xRenderQueryPictFormatsReply 32
@@ -231,8 +231,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- PictFormat format B32;
+ CARD16 length;
+ PictFormat format;
} xRenderQueryPictIndexValuesReq;
#define sz_xRenderQueryPictIndexValuesReq 8
@@ -240,14 +240,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD32 numIndexValues;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xRenderQueryPictIndexValuesReply;
#define sz_xRenderQueryPictIndexValuesReply 32
@@ -255,11 +255,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
- Drawable drawable B32;
- PictFormat format B32;
- CARD32 mask B32;
+ CARD16 length;
+ Picture pid;
+ Drawable drawable;
+ PictFormat format;
+ CARD32 mask;
} xRenderCreatePictureReq;
#define sz_xRenderCreatePictureReq 20
@@ -267,9 +267,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
- CARD32 mask B32;
+ CARD16 length;
+ Picture picture;
+ CARD32 mask;
} xRenderChangePictureReq;
#define sz_xRenderChangePictureReq 12
@@ -277,10 +277,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
- INT16 xOrigin B16;
- INT16 yOrigin B16;
+ CARD16 length;
+ Picture picture;
+ INT16 xOrigin;
+ INT16 yOrigin;
} xRenderSetPictureClipRectanglesReq;
#define sz_xRenderSetPictureClipRectanglesReq 12
@@ -288,8 +288,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
+ CARD16 length;
+ Picture picture;
} xRenderFreePictureReq;
#define sz_xRenderFreePictureReq 8
@@ -297,21 +297,21 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture mask B32;
- Picture dst B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
- INT16 xMask B16;
- INT16 yMask B16;
- INT16 xDst B16;
- INT16 yDst B16;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 pad2;
+ Picture src;
+ Picture mask;
+ Picture dst;
+ INT16 xSrc;
+ INT16 ySrc;
+ INT16 xMask;
+ INT16 yMask;
+ INT16 xDst;
+ INT16 yDst;
+ CARD16 width;
+ CARD16 height;
} xRenderCompositeReq;
#define sz_xRenderCompositeReq 36
@@ -319,17 +319,17 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture src B32;
- Picture dst B32;
- CARD32 colorScale B32;
- CARD32 alphaScale B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
- INT16 xDst B16;
- INT16 yDst B16;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ Picture src;
+ Picture dst;
+ CARD32 colorScale;
+ CARD32 alphaScale;
+ INT16 xSrc;
+ INT16 ySrc;
+ INT16 xDst;
+ INT16 yDst;
+ CARD16 width;
+ CARD16 height;
} xRenderScaleReq;
#define sz_xRenderScaleReq 32
@@ -337,15 +337,15 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture dst B32;
- PictFormat maskFormat B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
+ CARD16 pad2;
+ Picture src;
+ Picture dst;
+ PictFormat maskFormat;
+ INT16 xSrc;
+ INT16 ySrc;
} xRenderTrapezoidsReq;
#define sz_xRenderTrapezoidsReq 24
@@ -353,15 +353,15 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture dst B32;
- PictFormat maskFormat B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
+ CARD16 pad2;
+ Picture src;
+ Picture dst;
+ PictFormat maskFormat;
+ INT16 xSrc;
+ INT16 ySrc;
} xRenderTrianglesReq;
#define sz_xRenderTrianglesReq 24
@@ -369,15 +369,15 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture dst B32;
- PictFormat maskFormat B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
+ CARD16 pad2;
+ Picture src;
+ Picture dst;
+ PictFormat maskFormat;
+ INT16 xSrc;
+ INT16 ySrc;
} xRenderTriStripReq;
#define sz_xRenderTriStripReq 24
@@ -385,15 +385,15 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture dst B32;
- PictFormat maskFormat B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
+ CARD16 pad2;
+ Picture src;
+ Picture dst;
+ PictFormat maskFormat;
+ INT16 xSrc;
+ INT16 ySrc;
} xRenderTriFanReq;
#define sz_xRenderTriFanReq 24
@@ -401,9 +401,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Glyphset gsid B32;
- PictFormat format B32;
+ CARD16 length;
+ Glyphset gsid;
+ PictFormat format;
} xRenderCreateGlyphSetReq;
#define sz_xRenderCreateGlyphSetReq 12
@@ -411,9 +411,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Glyphset gsid B32;
- Glyphset existing B32;
+ CARD16 length;
+ Glyphset gsid;
+ Glyphset existing;
} xRenderReferenceGlyphSetReq;
#define sz_xRenderReferenceGlyphSetReq 24
@@ -421,8 +421,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Glyphset glyphset B32;
+ CARD16 length;
+ Glyphset glyphset;
} xRenderFreeGlyphSetReq;
#define sz_xRenderFreeGlyphSetReq 8
@@ -430,8 +430,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Glyphset glyphset B32;
+ CARD16 length;
+ Glyphset glyphset;
CARD32 nglyphs;
} xRenderAddGlyphsReq;
@@ -440,8 +440,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Glyphset glyphset B32;
+ CARD16 length;
+ Glyphset glyphset;
} xRenderFreeGlyphsReq;
#define sz_xRenderFreeGlyphsReq 8
@@ -449,16 +449,16 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture src B32;
- Picture dst B32;
- PictFormat maskFormat B32;
- Glyphset glyphset B32;
- INT16 xSrc B16;
- INT16 ySrc B16;
+ CARD16 pad2;
+ Picture src;
+ Picture dst;
+ PictFormat maskFormat;
+ Glyphset glyphset;
+ INT16 xSrc;
+ INT16 ySrc;
} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
@@ -471,11 +471,11 @@ xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 op;
CARD8 pad1;
- CARD16 pad2 B16;
- Picture dst B32;
+ CARD16 pad2;
+ Picture dst;
xRenderColor color;
} xRenderFillRectanglesReq;
@@ -486,11 +486,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Cursor cid B32;
- Picture src B32;
- CARD16 x B16;
- CARD16 y B16;
+ CARD16 length;
+ Cursor cid;
+ Picture src;
+ CARD16 x;
+ CARD16 y;
} xRenderCreateCursorReq;
#define sz_xRenderCreateCursorReq 16
@@ -501,15 +501,15 @@ typedef struct {
* This can't use an array because 32-bit values may be in bitfields
*/
typedef struct {
- Fixed matrix11 B32;
- Fixed matrix12 B32;
- Fixed matrix13 B32;
- Fixed matrix21 B32;
- Fixed matrix22 B32;
- Fixed matrix23 B32;
- Fixed matrix31 B32;
- Fixed matrix32 B32;
- Fixed matrix33 B32;
+ Fixed matrix11;
+ Fixed matrix12;
+ Fixed matrix13;
+ Fixed matrix21;
+ Fixed matrix22;
+ Fixed matrix23;
+ Fixed matrix31;
+ Fixed matrix32;
+ Fixed matrix33;
} xRenderTransform;
#define sz_xRenderTransform 36
@@ -517,8 +517,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
+ CARD16 length;
+ Picture picture;
xRenderTransform transform;
} xRenderSetPictureTransformReq;
@@ -527,8 +527,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Drawable drawable B32;
+ CARD16 length;
+ Drawable drawable;
} xRenderQueryFiltersReq;
#define sz_xRenderQueryFiltersReq 8
@@ -536,14 +536,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 numAliases B32; /* LISTofCARD16 */
- CARD32 numFilters B32; /* LISTofSTRING8 */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 numAliases; /* LISTofCARD16 */
+ CARD32 numFilters; /* LISTofSTRING8 */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xRenderQueryFiltersReply;
#define sz_xRenderQueryFiltersReply 32
@@ -551,10 +551,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
- CARD16 nbytes B16; /* number of bytes in name */
- CARD16 pad B16;
+ CARD16 length;
+ Picture picture;
+ CARD16 nbytes; /* number of bytes in name */
+ CARD16 pad;
} xRenderSetPictureFilterReq;
#define sz_xRenderSetPictureFilterReq 12
@@ -562,8 +562,8 @@ typedef struct {
/* 0.8 and higher */
typedef struct {
- Cursor cursor B32;
- CARD32 delay B32;
+ Cursor cursor;
+ CARD32 delay;
} xAnimCursorElt;
#define sz_xAnimCursorElt 8
@@ -571,8 +571,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Cursor cid B32;
+ CARD16 length;
+ Cursor cid;
} xRenderCreateAnimCursorReq;
#define sz_xRenderCreateAnimCursorReq 8
@@ -582,10 +582,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
+ CARD16 length;
Picture picture;
- INT16 xOff B16;
- INT16 yOff B16;
+ INT16 xOff;
+ INT16 yOff;
} xRenderAddTrapsReq;
#define sz_xRenderAddTrapsReq 12
@@ -595,8 +595,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
+ CARD16 length;
+ Picture pid;
xRenderColor color;
} xRenderCreateSolidFillReq;
@@ -605,8 +605,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
+ CARD16 length;
+ Picture pid;
xPointFixed p1;
xPointFixed p2;
CARD32 nStops;
@@ -617,8 +617,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
+ CARD16 length;
+ Picture pid;
xPointFixed inner;
xPointFixed outer;
Fixed inner_radius;
@@ -631,8 +631,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
+ CARD16 length;
+ Picture pid;
xPointFixed center;
Fixed angle; /* in degrees */
CARD32 nStops;
diff --git a/include/X11/extensions/saverproto.h b/include/X11/extensions/saverproto.h
index f0879af..0b8e34e 100644
--- a/include/X11/extensions/saverproto.h
+++ b/include/X11/extensions/saverproto.h
@@ -48,25 +48,25 @@ in this Software without prior written authorization from the X Consortium.
typedef struct _ScreenSaverQueryVersion {
CARD8 reqType; /* always ScreenSaverReqCode */
CARD8 saverReqType; /* always X_ScreenSaverQueryVersion */
- CARD16 length B16;
+ CARD16 length;
CARD8 clientMajor;
CARD8 clientMinor;
- CARD16 unused B16;
+ CARD16 unused;
} xScreenSaverQueryVersionReq;
#define sz_xScreenSaverQueryVersionReq 8
typedef struct {
CARD8 type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of protocol */
- CARD16 minorVersion B16; /* minor version of protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of protocol */
+ CARD16 minorVersion; /* minor version of protocol */
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xScreenSaverQueryVersionReply;
#define sz_xScreenSaverQueryVersionReply 32
@@ -75,24 +75,24 @@ typedef struct {
typedef struct _ScreenSaverQueryInfo {
CARD8 reqType; /* always ScreenSaverReqCode */
CARD8 saverReqType; /* always X_ScreenSaverQueryInfo */
- CARD16 length B16;
- Drawable drawable B32;
+ CARD16 length;
+ Drawable drawable;
} xScreenSaverQueryInfoReq;
#define sz_xScreenSaverQueryInfoReq 8
typedef struct {
CARD8 type; /* X_Reply */
BYTE state; /* Off, On */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Window window B32;
- CARD32 tilOrSince B32;
- CARD32 idle B32;
- CARD32 eventMask B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Window window;
+ CARD32 tilOrSince;
+ CARD32 idle;
+ CARD32 eventMask;
BYTE kind; /* Blanked, Internal, External */
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
+ CARD16 pad1;
+ CARD32 pad2;
} xScreenSaverQueryInfoReply;
#define sz_xScreenSaverQueryInfoReply 32
@@ -101,9 +101,9 @@ typedef struct {
typedef struct _ScreenSaverSelectInput {
CARD8 reqType; /* always ScreenSaverReqCode */
CARD8 saverReqType; /* always X_ScreenSaverSelectInput */
- CARD16 length B16;
- Drawable drawable B32;
- CARD32 eventMask B32;
+ CARD16 length;
+ Drawable drawable;
+ CARD32 eventMask;
} xScreenSaverSelectInputReq;
#define sz_xScreenSaverSelectInputReq 12
@@ -112,14 +112,14 @@ typedef struct _ScreenSaverSelectInput {
typedef struct _ScreenSaverSetAttributes {
CARD8 reqType; /* always ScreenSaverReqCode */
CARD8 saverReqType; /* always X_ScreenSaverSetAttributes */
- CARD16 length B16;
- Drawable drawable B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
+ CARD16 length;
+ Drawable drawable;
+ INT16 x, y;
+ CARD16 width, height, borderWidth;
BYTE c_class;
CARD8 depth;
- VisualID visualID B32;
- CARD32 mask B32;
+ VisualID visualID;
+ CARD32 mask;
} xScreenSaverSetAttributesReq;
#define sz_xScreenSaverSetAttributesReq 28
@@ -128,8 +128,8 @@ typedef struct _ScreenSaverSetAttributes {
typedef struct _ScreenSaverUnsetAttributes {
CARD8 reqType; /* always ScreenSaverReqCode */
CARD8 saverReqType; /* always X_ScreenSaverUnsetAttributes */
- CARD16 length B16;
- Drawable drawable B32;
+ CARD16 length;
+ Drawable drawable;
} xScreenSaverUnsetAttributesReq;
#define sz_xScreenSaverUnsetAttributesReq 8
@@ -138,24 +138,24 @@ typedef struct _ScreenSaverUnsetAttributes {
typedef struct _ScreenSaverSuspend {
CARD8 reqType;
CARD8 saverReqType;
- CARD16 length B16;
- CARD32 suspend B32; /* a boolean, but using the wrong encoding */
+ CARD16 length;
+ CARD32 suspend; /* a boolean, but using the wrong encoding */
} xScreenSaverSuspendReq;
#define sz_xScreenSaverSuspendReq 8
typedef struct _ScreenSaverNotify {
CARD8 type; /* always eventBase + ScreenSaverNotify */
BYTE state; /* off, on, cycle */
- CARD16 sequenceNumber B16;
- Time timestamp B32;
- Window root B32;
- Window window B32; /* screen saver window */
+ CARD16 sequenceNumber;
+ Time timestamp;
+ Window root;
+ Window window; /* screen saver window */
BYTE kind; /* blanked, internal, external */
BYTE forced;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xScreenSaverNotifyEvent;
#define sz_xScreenSaverNotifyEvent 32
diff --git a/include/X11/extensions/securproto.h b/include/X11/extensions/securproto.h
index 409a4c5..d9e120c 100644
--- a/include/X11/extensions/securproto.h
+++ b/include/X11/extensions/securproto.h
@@ -36,34 +36,34 @@ from The Open Group.
typedef struct {
CARD8 reqType;
CARD8 securityReqType;
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xSecurityQueryVersionReq;
#define sz_xSecurityQueryVersionReq 8
typedef struct {
CARD8 type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xSecurityQueryVersionReply;
#define sz_xSecurityQueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 securityReqType;
- CARD16 length B16;
- CARD16 nbytesAuthProto B16;
- CARD16 nbytesAuthData B16;
- CARD32 valueMask B32;
+ CARD16 length;
+ CARD16 nbytesAuthProto;
+ CARD16 nbytesAuthData;
+ CARD32 valueMask;
/* auth protocol name padded to 4 bytes */
/* auth protocol data padded to 4 bytes */
/* list of CARD32 values, if any */
@@ -73,37 +73,37 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 authId B32;
- CARD16 dataLength B16;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 authId;
+ CARD16 dataLength;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xSecurityGenerateAuthorizationReply;
#define sz_xSecurityGenerateAuthorizationReply 32
typedef struct {
CARD8 reqType;
CARD8 securityReqType;
- CARD16 length B16;
- CARD32 authId B32;
+ CARD16 length;
+ CARD32 authId;
} xSecurityRevokeAuthorizationReq;
#define sz_xSecurityRevokeAuthorizationReq 8
typedef struct _xSecurityAuthorizationRevokedEvent {
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
- CARD32 authId B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 authId;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xSecurityAuthorizationRevokedEvent;
#define sz_xSecurityAuthorizationRevokedEvent 32
diff --git a/include/X11/extensions/shapeproto.h b/include/X11/extensions/shapeproto.h
index 49bd1a1..e5c1838 100644
--- a/include/X11/extensions/shapeproto.h
+++ b/include/X11/extensions/shapeproto.h
@@ -50,184 +50,184 @@ in this Software without prior written authorization from The Open Group.
typedef struct _ShapeQueryVersion {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xShapeQueryVersionReq;
#define sz_xShapeQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of SHAPE protocol */
- CARD16 minorVersion B16; /* minor version of SHAPE protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of SHAPE protocol */
+ CARD16 minorVersion; /* minor version of SHAPE protocol */
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xShapeQueryVersionReply;
#define sz_xShapeQueryVersionReply 32
typedef struct _ShapeRectangles {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeRectangles */
- CARD16 length B16;
+ CARD16 length;
CARD8 op; /* Set, ... */
CARD8 destKind; /* ShapeBounding or ShapeClip */
CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */
CARD8 pad0; /* not used */
- Window dest B32;
- INT16 xOff B16;
- INT16 yOff B16;
+ Window dest;
+ INT16 xOff;
+ INT16 yOff;
} xShapeRectanglesReq; /* followed by xRects */
#define sz_xShapeRectanglesReq 16
typedef struct _ShapeMask {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeMask */
- CARD16 length B16;
+ CARD16 length;
CARD8 op; /* Set, ... */
CARD8 destKind; /* ShapeBounding or ShapeClip */
- CARD16 junk B16; /* not used */
+ CARD16 junk; /* not used */
- Window dest B32;
- INT16 xOff B16;
- INT16 yOff B16;
- CARD32 src B32; /* 1 bit pixmap */
+ Window dest;
+ INT16 xOff;
+ INT16 yOff;
+ CARD32 src; /* 1 bit pixmap */
} xShapeMaskReq;
#define sz_xShapeMaskReq 20
typedef struct _ShapeCombine {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeCombine */
- CARD16 length B16;
+ CARD16 length;
CARD8 op; /* Set, ... */
CARD8 destKind; /* ShapeBounding or ShapeClip */
CARD8 srcKind; /* ShapeBounding or ShapeClip */
CARD8 junk; /* not used */
- Window dest B32;
- INT16 xOff B16;
- INT16 yOff B16;
- Window src B32;
+ Window dest;
+ INT16 xOff;
+ INT16 yOff;
+ Window src;
} xShapeCombineReq;
#define sz_xShapeCombineReq 20
typedef struct _ShapeOffset {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeOffset */
- CARD16 length B16;
+ CARD16 length;
CARD8 destKind; /* ShapeBounding or ShapeClip */
CARD8 junk1; /* not used */
- CARD16 junk2 B16; /* not used */
- Window dest B32;
- INT16 xOff B16;
- INT16 yOff B16;
+ CARD16 junk2; /* not used */
+ Window dest;
+ INT16 xOff;
+ INT16 yOff;
} xShapeOffsetReq;
#define sz_xShapeOffsetReq 16
typedef struct _ShapeQueryExtents {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeQueryExtents */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xShapeQueryExtentsReq;
#define sz_xShapeQueryExtentsReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
CARD8 boundingShaped; /* window has bounding shape */
CARD8 clipShaped; /* window has clip shape */
- CARD16 unused1 B16;
- INT16 xBoundingShape B16; /* extents of bounding shape */
- INT16 yBoundingShape B16;
- CARD16 widthBoundingShape B16;
- CARD16 heightBoundingShape B16;
- INT16 xClipShape B16; /* extents of clip shape */
- INT16 yClipShape B16;
- CARD16 widthClipShape B16;
- CARD16 heightClipShape B16;
- CARD32 pad1 B32;
+ CARD16 unused1;
+ INT16 xBoundingShape; /* extents of bounding shape */
+ INT16 yBoundingShape;
+ CARD16 widthBoundingShape;
+ CARD16 heightBoundingShape;
+ INT16 xClipShape; /* extents of clip shape */
+ INT16 yClipShape;
+ CARD16 widthClipShape;
+ CARD16 heightClipShape;
+ CARD32 pad1;
} xShapeQueryExtentsReply;
#define sz_xShapeQueryExtentsReply 32
typedef struct _ShapeSelectInput {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeSelectInput */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
BYTE enable; /* xTrue -> send events */
BYTE pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xShapeSelectInputReq;
#define sz_xShapeSelectInputReq 12
typedef struct _ShapeNotify {
BYTE type; /* always eventBase + ShapeNotify */
BYTE kind; /* either ShapeBounding or ShapeClip */
- CARD16 sequenceNumber B16;
- Window window B32;
- INT16 x B16;
- INT16 y B16; /* extents of new shape */
- CARD16 width B16;
- CARD16 height B16;
- Time time B32; /* time of change */
+ CARD16 sequenceNumber;
+ Window window;
+ INT16 x;
+ INT16 y; /* extents of new shape */
+ CARD16 width;
+ CARD16 height;
+ Time time; /* time of change */
BYTE shaped; /* set when a shape actual exists */
BYTE pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xShapeNotifyEvent;
#define sz_xShapeNotifyEvent 32
typedef struct _ShapeInputSelected {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeInputSelected */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xShapeInputSelectedReq;
#define sz_xShapeInputSelectedReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 enabled; /* current status */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* 0 */
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* 0 */
+ CARD32 pad1; /* unused */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xShapeInputSelectedReply;
#define sz_xShapeInputSelectedReply 32
typedef struct _ShapeGetRectangles {
CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeGetRectangles */
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
CARD8 kind; /* ShapeBounding or ShapeClip */
CARD8 junk1;
- CARD16 junk2 B16;
+ CARD16 junk2;
} xShapeGetRectanglesReq;
#define sz_xShapeGetRectanglesReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* not zero */
- CARD32 nrects B32; /* number of rectangles */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* not zero */
+ CARD32 nrects; /* number of rectangles */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xShapeGetRectanglesReply; /* followed by xRectangles */
#define sz_xShapeGetRectanglesReply 32
diff --git a/include/X11/extensions/shmproto.h b/include/X11/extensions/shmproto.h
index 8136aa9..6e32606 100644
--- a/include/X11/extensions/shmproto.h
+++ b/include/X11/extensions/shmproto.h
@@ -49,134 +49,134 @@ in this Software without prior written authorization from The Open Group.
typedef struct _ShmQueryVersion {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xShmQueryVersionReq;
#define sz_xShmQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL sharedPixmaps;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of SHM protocol */
- CARD16 minorVersion B16; /* minor version of SHM protocol */
- CARD16 uid B16;
- CARD16 gid B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of SHM protocol */
+ CARD16 minorVersion; /* minor version of SHM protocol */
+ CARD16 uid;
+ CARD16 gid;
CARD8 pixmapFormat;
CARD8 pad0;
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xShmQueryVersionReply;
#define sz_xShmQueryVersionReply 32
typedef struct _ShmAttach {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmAttach */
- CARD16 length B16;
- ShmSeg shmseg B32;
- CARD32 shmid B32;
+ CARD16 length;
+ ShmSeg shmseg;
+ CARD32 shmid;
BOOL readOnly;
BYTE pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xShmAttachReq;
#define sz_xShmAttachReq 16
typedef struct _ShmDetach {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmDetach */
- CARD16 length B16;
- ShmSeg shmseg B32;
+ CARD16 length;
+ ShmSeg shmseg;
} xShmDetachReq;
#define sz_xShmDetachReq 8
typedef struct _ShmPutImage {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmPutImage */
- CARD16 length B16;
- Drawable drawable B32;
- GContext gc B32;
- CARD16 totalWidth B16;
- CARD16 totalHeight B16;
- CARD16 srcX B16;
- CARD16 srcY B16;
- CARD16 srcWidth B16;
- CARD16 srcHeight B16;
- INT16 dstX B16;
- INT16 dstY B16;
+ CARD16 length;
+ Drawable drawable;
+ GContext gc;
+ CARD16 totalWidth;
+ CARD16 totalHeight;
+ CARD16 srcX;
+ CARD16 srcY;
+ CARD16 srcWidth;
+ CARD16 srcHeight;
+ INT16 dstX;
+ INT16 dstY;
CARD8 depth;
CARD8 format;
CARD8 sendEvent;
CARD8 bpad;
- ShmSeg shmseg B32;
- CARD32 offset B32;
+ ShmSeg shmseg;
+ CARD32 offset;
} xShmPutImageReq;
#define sz_xShmPutImageReq 40
typedef struct _ShmGetImage {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmGetImage */
- CARD16 length B16;
- Drawable drawable B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 planeMask B32;
+ CARD16 length;
+ Drawable drawable;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD32 planeMask;
CARD8 format;
CARD8 pad0;
CARD8 pad1;
CARD8 pad2;
- ShmSeg shmseg B32;
- CARD32 offset B32;
+ ShmSeg shmseg;
+ CARD32 offset;
} xShmGetImageReq;
#define sz_xShmGetImageReq 32
typedef struct _ShmGetImageReply {
BYTE type; /* X_Reply */
CARD8 depth;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- VisualID visual B32;
- CARD32 size B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ VisualID visual;
+ CARD32 size;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xShmGetImageReply;
#define sz_xShmGetImageReply 32
typedef struct _ShmCreatePixmap {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmCreatePixmap */
- CARD16 length B16;
- Pixmap pid B32;
- Drawable drawable B32;
- CARD16 width B16;
- CARD16 height B16;
+ CARD16 length;
+ Pixmap pid;
+ Drawable drawable;
+ CARD16 width;
+ CARD16 height;
CARD8 depth;
CARD8 pad0;
CARD8 pad1;
CARD8 pad2;
- ShmSeg shmseg B32;
- CARD32 offset B32;
+ ShmSeg shmseg;
+ CARD32 offset;
} xShmCreatePixmapReq;
#define sz_xShmCreatePixmapReq 28
typedef struct _ShmCompletion {
BYTE type; /* always eventBase + ShmCompletion */
BYTE bpad0;
- CARD16 sequenceNumber B16;
- Drawable drawable B32;
- CARD16 minorEvent B16;
+ CARD16 sequenceNumber;
+ Drawable drawable;
+ CARD16 minorEvent;
BYTE majorEvent;
BYTE bpad1;
- ShmSeg shmseg B32;
- CARD32 offset B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ ShmSeg shmseg;
+ CARD32 offset;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
} xShmCompletionEvent;
#define sz_xShmCompletionEvent 32
@@ -184,11 +184,11 @@ typedef struct _ShmCompletion {
typedef struct _ShmAttachFd {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmAttachFd */
- CARD16 length B16;
- ShmSeg shmseg B32;
+ CARD16 length;
+ ShmSeg shmseg;
BOOL readOnly;
BYTE pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xShmAttachFdReq;
/* File descriptor is passed with this request */
#define sz_xShmAttachFdReq 12
@@ -196,26 +196,26 @@ typedef struct _ShmAttachFd {
typedef struct _ShmCreateSegment {
CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmAttachFd */
- CARD16 length B16;
- ShmSeg shmseg B32;
- CARD32 size B32;
+ CARD16 length;
+ ShmSeg shmseg;
+ CARD32 size;
BOOL readOnly;
BYTE pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} xShmCreateSegmentReq;
#define sz_xShmCreateSegmentReq 16
typedef struct {
CARD8 type; /* must be X_Reply */
CARD8 nfd; /* must be 1 */
- CARD16 sequenceNumber B16; /* last sequence number */
- CARD32 length B32; /* 0 */
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
- CARD32 pad6 B32; /* unused */
- CARD32 pad7 B32; /* unused */
+ CARD16 sequenceNumber; /* last sequence number */
+ CARD32 length; /* 0 */
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
+ CARD32 pad6; /* unused */
+ CARD32 pad7; /* unused */
} xShmCreateSegmentReply;
/* File descriptor is passed with this reply */
#define sz_xShmCreateSegmentReply 32
diff --git a/include/X11/extensions/syncproto.h b/include/X11/extensions/syncproto.h
index 1453e44..0fa1db7 100644
--- a/include/X11/extensions/syncproto.h
+++ b/include/X11/extensions/syncproto.h
@@ -89,26 +89,26 @@ PERFORMANCE OF THIS SOFTWARE.
typedef struct _xSyncInitialize {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
+ CARD16 length;
CARD8 majorVersion;
CARD8 minorVersion;
- CARD16 pad B16;
+ CARD16 pad;
} xSyncInitializeReq;
#define sz_xSyncInitializeReq 8
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 majorVersion;
CARD8 minorVersion;
- CARD16 pad B16;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 pad;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xSyncInitializeReply;
#define sz_xSyncInitializeReply 32
@@ -119,29 +119,29 @@ typedef struct _xSyncListSystemCounters
{
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
+ CARD16 length;
} xSyncListSystemCountersReq;
#define sz_xSyncListSystemCountersReq 4
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT32 nCounters B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT32 nCounters;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xSyncListSystemCountersReply;
#define sz_xSyncListSystemCountersReply 32
typedef struct {
- XSyncCounter counter B32;
- INT32 resolution_hi B32;
- CARD32 resolution_lo B32;
- CARD16 name_length B16;
+ XSyncCounter counter;
+ INT32 resolution_hi;
+ CARD32 resolution_lo;
+ CARD16 name_length;
} xSyncSystemCounter;
#define sz_xSyncSystemCounter 14
@@ -151,10 +151,10 @@ typedef struct {
typedef struct _xSyncCreateCounterReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncCounter cid B32;
- INT32 initial_value_hi B32;
- CARD32 initial_value_lo B32;
+ CARD16 length;
+ XSyncCounter cid;
+ INT32 initial_value_hi;
+ CARD32 initial_value_lo;
} xSyncCreateCounterReq;
#define sz_xSyncCreateCounterReq 16
@@ -164,10 +164,10 @@ typedef struct _xSyncCreateCounterReq {
typedef struct _xSyncChangeCounterReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncCounter cid B32;
- INT32 value_hi B32;
- CARD32 value_lo B32;
+ CARD16 length;
+ XSyncCounter cid;
+ INT32 value_hi;
+ CARD32 value_lo;
} xSyncChangeCounterReq;
#define sz_xSyncChangeCounterReq 16
@@ -177,10 +177,10 @@ typedef struct _xSyncChangeCounterReq {
typedef struct _xSyncSetCounterReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncCounter cid B32;
- INT32 value_hi B32;
- CARD32 value_lo B32;
+ CARD16 length;
+ XSyncCounter cid;
+ INT32 value_hi;
+ CARD32 value_lo;
} xSyncSetCounterReq;
#define sz_xSyncSetCounterReq 16
@@ -190,8 +190,8 @@ typedef struct _xSyncSetCounterReq {
typedef struct _xSyncDestroyCounterReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncCounter counter B32;
+ CARD16 length;
+ XSyncCounter counter;
} xSyncDestroyCounterReq;
#define sz_xSyncDestroyCounterReq 8
@@ -201,8 +201,8 @@ typedef struct _xSyncDestroyCounterReq {
typedef struct _xSyncQueryCounterReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncCounter counter B32;
+ CARD16 length;
+ XSyncCounter counter;
} xSyncQueryCounterReq;
#define sz_xSyncQueryCounterReq 8
@@ -210,14 +210,14 @@ typedef struct _xSyncQueryCounterReq {
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT32 value_hi B32;
- CARD32 value_lo B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT32 value_hi;
+ CARD32 value_lo;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xSyncQueryCounterReply;
#define sz_xSyncQueryCounterReply 32
@@ -227,18 +227,18 @@ typedef struct {
typedef struct _xSyncAwaitReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
+ CARD16 length;
} xSyncAwaitReq;
#define sz_xSyncAwaitReq 4
typedef struct _xSyncWaitCondition {
- XSyncCounter counter B32;
- CARD32 value_type B32;
- INT32 wait_value_hi B32;
- CARD32 wait_value_lo B32;
- CARD32 test_type B32;
- INT32 event_threshold_hi B32;
- CARD32 event_threshold_lo B32;
+ XSyncCounter counter;
+ CARD32 value_type;
+ INT32 wait_value_hi;
+ CARD32 wait_value_lo;
+ CARD32 test_type;
+ INT32 event_threshold_hi;
+ CARD32 event_threshold_lo;
} xSyncWaitCondition;
#define sz_xSyncWaitCondition 28
@@ -248,9 +248,9 @@ typedef struct _xSyncWaitCondition {
typedef struct _xSyncCreateAlarmReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncAlarm id B32;
- CARD32 valueMask B32;
+ CARD16 length;
+ XSyncAlarm id;
+ CARD32 valueMask;
} xSyncCreateAlarmReq;
#define sz_xSyncCreateAlarmReq 12
@@ -260,8 +260,8 @@ typedef struct _xSyncCreateAlarmReq {
typedef struct _xSyncDestroyAlarmReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncAlarm alarm B32;
+ CARD16 length;
+ XSyncAlarm alarm;
} xSyncDestroyAlarmReq;
#define sz_xSyncDestroyAlarmReq 8
@@ -271,23 +271,23 @@ typedef struct _xSyncDestroyAlarmReq {
typedef struct _xSyncQueryAlarmReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncAlarm alarm B32;
+ CARD16 length;
+ XSyncAlarm alarm;
} xSyncQueryAlarmReq;
#define sz_xSyncQueryAlarmReq 8
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- XSyncCounter counter B32;
- CARD32 value_type B32;
- INT32 wait_value_hi B32;
- CARD32 wait_value_lo B32;
- CARD32 test_type B32;
- INT32 delta_hi B32;
- CARD32 delta_lo B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ XSyncCounter counter;
+ CARD32 value_type;
+ INT32 wait_value_hi;
+ CARD32 wait_value_lo;
+ CARD32 test_type;
+ INT32 delta_hi;
+ CARD32 delta_lo;
BOOL events;
BYTE state;
BYTE pad0;
@@ -301,9 +301,9 @@ typedef struct {
typedef struct _xSyncChangeAlarmReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncAlarm alarm B32;
- CARD32 valueMask B32;
+ CARD16 length;
+ XSyncAlarm alarm;
+ CARD32 valueMask;
} xSyncChangeAlarmReq;
#define sz_xSyncChangeAlarmReq 12
@@ -313,9 +313,9 @@ typedef struct _xSyncChangeAlarmReq {
typedef struct _xSyncSetPriority{
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- CARD32 id B32;
- INT32 priority B32;
+ CARD16 length;
+ CARD32 id;
+ INT32 priority;
} xSyncSetPriorityReq;
#define sz_xSyncSetPriorityReq 12
@@ -325,22 +325,22 @@ typedef struct _xSyncSetPriority{
typedef struct _xSyncGetPriority{
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- CARD32 id B32; /*XXX XID? */
+ CARD16 length;
+ CARD32 id; /*XXX XID? */
} xSyncGetPriorityReq;
#define sz_xSyncGetPriorityReq 8
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT32 priority B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT32 priority;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xSyncGetPriorityReply;
#define sz_xSyncGetPriorityReply 32
@@ -350,9 +350,9 @@ typedef struct {
typedef struct _xSyncCreateFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- Drawable d B32;
- XSyncFence fid B32;
+ CARD16 length;
+ Drawable d;
+ XSyncFence fid;
BOOL initially_triggered;
CARD8 pad0;
CARD16 pad1;
@@ -365,8 +365,8 @@ typedef struct _xSyncCreateFenceReq {
typedef struct _xSyncTriggerFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncFence fid B32;
+ CARD16 length;
+ XSyncFence fid;
} xSyncTriggerFenceReq;
#define sz_xSyncTriggerFenceReq 8
@@ -376,8 +376,8 @@ typedef struct _xSyncTriggerFenceReq {
typedef struct _xSyncResetFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncFence fid B32;
+ CARD16 length;
+ XSyncFence fid;
} xSyncResetFenceReq;
#define sz_xSyncResetFenceReq 8
@@ -387,8 +387,8 @@ typedef struct _xSyncResetFenceReq {
typedef struct _xSyncDestroyFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncFence fid B32;
+ CARD16 length;
+ XSyncFence fid;
} xSyncDestroyFenceReq;
#define sz_xSyncDestroyFenceReq 8
@@ -398,8 +398,8 @@ typedef struct _xSyncDestroyFenceReq {
typedef struct _xSyncQueryFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
- XSyncFence fid B32;
+ CARD16 length;
+ XSyncFence fid;
} xSyncQueryFenceReq;
#define sz_xSyncQueryFenceReq 8
@@ -410,23 +410,23 @@ typedef struct _xSyncQueryFenceReq {
typedef struct _xSyncAwaitFenceReq {
CARD8 reqType;
CARD8 syncReqType;
- CARD16 length B16;
+ CARD16 length;
} xSyncAwaitFenceReq;
#define sz_xSyncAwaitFenceReq 4
typedef struct {
BYTE type;
CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
BOOL triggered;
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;
} xSyncQueryFenceReply;
#define sz_xSyncQueryFenceReply 32
@@ -437,14 +437,14 @@ typedef struct {
typedef struct _xSyncCounterNotifyEvent {
BYTE type;
BYTE kind;
- CARD16 sequenceNumber B16;
- XSyncCounter counter B32;
- INT32 wait_value_hi B32;
- CARD32 wait_value_lo B32;
- INT32 counter_value_hi B32;
- CARD32 counter_value_lo B32;
- CARD32 time B32;
- CARD16 count B16;
+ CARD16 sequenceNumber;
+ XSyncCounter counter;
+ INT32 wait_value_hi;
+ CARD32 wait_value_lo;
+ INT32 counter_value_hi;
+ CARD32 counter_value_lo;
+ CARD32 time;
+ CARD16 count;
BOOL destroyed;
BYTE pad0;
} xSyncCounterNotifyEvent;
@@ -452,13 +452,13 @@ typedef struct _xSyncCounterNotifyEvent {
typedef struct _xSyncAlarmNotifyEvent {
BYTE type;
BYTE kind;
- CARD16 sequenceNumber B16;
- XSyncAlarm alarm B32;
- INT32 counter_value_hi B32;
- CARD32 counter_value_lo B32;
- INT32 alarm_value_hi B32;
- CARD32 alarm_value_lo B32;
- CARD32 time B32;
+ CARD16 sequenceNumber;
+ XSyncAlarm alarm;
+ INT32 counter_value_hi;
+ CARD32 counter_value_lo;
+ INT32 alarm_value_hi;
+ CARD32 alarm_value_lo;
+ CARD32 time;
CARD8 state;
BYTE pad0;
BYTE pad1;
diff --git a/include/X11/extensions/windowswmstr.h b/include/X11/extensions/windowswmstr.h
index 37ceb53..b4e75aa 100644
--- a/include/X11/extensions/windowswmstr.h
+++ b/include/X11/extensions/windowswmstr.h
@@ -45,124 +45,124 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
typedef struct _WindowsWMQueryVersion {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xWindowsWMQueryVersionReq;
#define sz_xWindowsWMQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of WM protocol */
- CARD16 minorVersion B16; /* minor version of WM protocol */
- CARD32 patchVersion B32; /* patch version of WM protocol */
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of WM protocol */
+ CARD16 minorVersion; /* minor version of WM protocol */
+ CARD32 patchVersion; /* patch version of WM protocol */
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xWindowsWMQueryVersionReply;
#define sz_xWindowsWMQueryVersionReply 32
typedef struct _WindowsWMDisableUpdate {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMDisableUpdate */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xWindowsWMDisableUpdateReq;
#define sz_xWindowsWMDisableUpdateReq 8
typedef struct _WindowsWMReenableUpdate {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMReenableUpdate */
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xWindowsWMReenableUpdateReq;
#define sz_xWindowsWMReenableUpdateReq 8
typedef struct _WindowsWMSelectInput {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMSelectInput */
- CARD16 length B16;
- CARD32 mask B32;
+ CARD16 length;
+ CARD32 mask;
} xWindowsWMSelectInputReq;
#define sz_xWindowsWMSelectInputReq 8
typedef struct _WindowsWMNotify {
BYTE type; /* always eventBase + event type */
BYTE kind;
- CARD16 sequenceNumber B16;
- Window window B32;
- Time time B32; /* time of change */
- CARD16 pad1 B16;
- CARD32 arg B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 w B16;
- CARD16 h B16;
+ CARD16 sequenceNumber;
+ Window window;
+ Time time; /* time of change */
+ CARD16 pad1;
+ CARD32 arg;
+ INT16 x;
+ INT16 y;
+ CARD16 w;
+ CARD16 h;
} xWindowsWMNotifyEvent;
#define sz_xWindowsWMNotifyEvent 28
typedef struct _WindowsWMSetFrontProcess {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMSetFrontProcess */
- CARD16 length B16;
+ CARD16 length;
} xWindowsWMSetFrontProcessReq;
#define sz_xWindowsWMSetFrontProcessReq 4
typedef struct _WindowsWMFrameGetRect {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMFrameGetRect */
- CARD16 length B16;
- CARD32 frame_style B32;
- CARD32 frame_style_ex B32;
- CARD16 frame_rect B16;
- INT16 ix B16;
- INT16 iy B16;
- CARD16 iw B16;
- CARD16 ih B16;
- CARD16 pad1 B16;
+ CARD16 length;
+ CARD32 frame_style;
+ CARD32 frame_style_ex;
+ CARD16 frame_rect;
+ INT16 ix;
+ INT16 iy;
+ CARD16 iw;
+ CARD16 ih;
+ CARD16 pad1;
} xWindowsWMFrameGetRectReq;
#define sz_xWindowsWMFrameGetRectReq 24
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 w B16;
- CARD16 h B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT16 x;
+ INT16 y;
+ CARD16 w;
+ CARD16 h;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xWindowsWMFrameGetRectReply;
#define sz_xWindowsWMFrameGetRectReply 32
typedef struct _WindowsWMFrameDraw {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMFrameDraw */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 window B32;
- CARD32 frame_style B32;
- CARD32 frame_style_ex B32;
- INT16 ix B16;
- INT16 iy B16;
- CARD16 iw B16;
- CARD16 ih B16;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 window;
+ CARD32 frame_style;
+ CARD32 frame_style_ex;
+ INT16 ix;
+ INT16 iy;
+ CARD16 iw;
+ CARD16 ih;
} xWindowsWMFrameDrawReq;
#define sz_xWindowsWMFrameDrawReq 28
typedef struct _WindowsWMFrameSetTitle {
CARD8 reqType; /* always WMReqCode */
CARD8 wmReqType; /* always X_WMFrameSetTitle */
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 window B32;
- CARD32 title_length B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 window;
+ CARD32 title_length;
} xWindowsWMFrameSetTitleReq;
#define sz_xWindowsWMFrameSetTitleReq 16
diff --git a/include/X11/extensions/xcalibrateproto.h b/include/X11/extensions/xcalibrateproto.h
index 2301754..cafdab2 100644
--- a/include/X11/extensions/xcalibrateproto.h
+++ b/include/X11/extensions/xcalibrateproto.h
@@ -31,9 +31,9 @@
typedef struct {
CARD8 reqType;
CARD8 xCalibrateReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xXCalibrateQueryVersionReq;
#define sz_xXCalibrateQueryVersionReq 12
@@ -41,14 +41,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXCalibrateQueryVersionReply;
#define sz_xXCalibrateQueryVersionReply 32
@@ -56,9 +56,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xCalibrateReqType;
- CARD16 length B16;
- CARD16 on B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 on;
+ CARD16 pad;
} xXCalibrateRawModeReq;
#define sz_xXCalibrateRawModeReq 8
@@ -66,14 +66,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 status;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXCalibrateRawModeReply;
#define sz_xXCalibrateRawModeReply 32
@@ -81,9 +81,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xCalibrateReqType;
- CARD16 length B16;
- CARD32 x B32;
- CARD32 y B32;
+ CARD16 length;
+ CARD32 x;
+ CARD32 y;
} xXCalibrateScreenToCoordReq;
#define sz_xXCalibrateScreenToCoordReq 12
@@ -91,14 +91,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD32 x;
CARD32 y;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXCalibrateScreenToCoordReply;
#define sz_xXCalibrateScreenToCoordReply 32
@@ -108,7 +108,7 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD16 x;
CARD16 y;
CARD16 pressure;
diff --git a/include/X11/extensions/xcmiscproto.h b/include/X11/extensions/xcmiscproto.h
index 482c2dc..616cec3 100644
--- a/include/X11/extensions/xcmiscproto.h
+++ b/include/X11/extensions/xcmiscproto.h
@@ -43,67 +43,67 @@ in this Software without prior written authorization from The Open Group.
typedef struct {
CARD8 reqType; /* always XCMiscCode */
CARD8 miscReqType; /* always X_XCMiscGetVersion */
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xXCMiscGetVersionReq;
#define sz_xXCMiscGetVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXCMiscGetVersionReply;
#define sz_xXCMiscGetVersionReply 32
typedef struct {
CARD8 reqType; /* always XCMiscCode */
CARD8 miscReqType; /* always X_XCMiscGetXIDRange */
- CARD16 length B16;
+ CARD16 length;
} xXCMiscGetXIDRangeReq;
#define sz_xXCMiscGetXIDRangeReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 start_id B32;
- CARD32 count B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 start_id;
+ CARD32 count;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xXCMiscGetXIDRangeReply;
#define sz_xXCMiscGetXIDRangeReply 32
typedef struct {
CARD8 reqType; /* always XCMiscCode */
CARD8 miscReqType; /* always X_XCMiscGetXIDList */
- CARD16 length B16;
- CARD32 count B32; /* number of IDs requested */
+ CARD16 length;
+ CARD32 count; /* number of IDs requested */
} xXCMiscGetXIDListReq;
#define sz_xXCMiscGetXIDListReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 count B32; /* number of IDs requested */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 count; /* number of IDs requested */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXCMiscGetXIDListReply;
#define sz_xXCMiscGetXIDListReply 32
diff --git a/include/X11/extensions/xf86bigfproto.h b/include/X11/extensions/xf86bigfproto.h
index c041c9a..a0710dd 100644
--- a/include/X11/extensions/xf86bigfproto.h
+++ b/include/X11/extensions/xf86bigfproto.h
@@ -20,22 +20,22 @@
typedef struct _XF86BigfontQueryVersion {
CARD8 reqType; /* always XF86BigfontReqCode */
CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86BigfontQueryVersionReq;
#define sz_xXF86BigfontQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
CARD8 capabilities;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of XFree86-Bigfont */
- CARD16 minorVersion B16; /* minor version of XFree86-Bigfont */
- CARD32 uid B32;
- CARD32 gid B32;
- CARD32 signature B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of XFree86-Bigfont */
+ CARD16 minorVersion; /* minor version of XFree86-Bigfont */
+ CARD32 uid;
+ CARD32 gid;
+ CARD32 signature;
+ CARD32 pad1;
+ CARD32 pad2;
} xXF86BigfontQueryVersionReply;
#define sz_xXF86BigfontQueryVersionReply 32
@@ -45,39 +45,39 @@ typedef struct {
typedef struct _XF86BigfontQueryFont {
CARD8 reqType; /* always XF86BigfontReqCode */
CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryFont */
- CARD16 length B16;
- CARD32 id B32;
- CARD32 flags B32;
+ CARD16 length;
+ CARD32 id;
+ CARD32 flags;
} xXF86BigfontQueryFontReq;
#define sz_xXF86BigfontQueryFontReq 12
typedef struct {
BYTE type; /* X_Reply */
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
xCharInfo minBounds;
#ifndef WORD64
- CARD32 walign1 B32;
+ CARD32 walign1;
#endif
xCharInfo maxBounds;
#ifndef WORD64
- CARD32 walign2 B32;
+ CARD32 walign2;
#endif
- CARD16 minCharOrByte2 B16;
- CARD16 maxCharOrByte2 B16;
- CARD16 defaultChar B16;
- CARD16 nFontProps B16;
+ CARD16 minCharOrByte2;
+ CARD16 maxCharOrByte2;
+ CARD16 defaultChar;
+ CARD16 nFontProps;
CARD8 drawDirection;
CARD8 minByte1;
CARD8 maxByte1;
BOOL allCharsExist;
- INT16 fontAscent B16;
- INT16 fontDescent B16;
- CARD32 nCharInfos B32;
- CARD32 nUniqCharInfos B32;
- CARD32 shmid B32;
- CARD32 shmsegoffset B32;
+ INT16 fontAscent;
+ INT16 fontDescent;
+ CARD32 nCharInfos;
+ CARD32 nUniqCharInfos;
+ CARD32 shmid;
+ CARD32 shmsegoffset;
/* followed by nFontProps xFontProp structures */
/* and if nCharInfos > 0 && shmid == -1,
followed by nUniqCharInfos xCharInfo structures
diff --git a/include/X11/extensions/xf86dga1proto.h b/include/X11/extensions/xf86dga1proto.h
index c724ba3..61d95b3 100644
--- a/include/X11/extensions/xf86dga1proto.h
+++ b/include/X11/extensions/xf86dga1proto.h
@@ -13,41 +13,41 @@ Copyright (c) 1995 XFree86 Inc.
typedef struct _XF86DGAQueryVersion {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86DGAQueryVersionReq;
#define sz_xXF86DGAQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of DGA protocol */
- CARD16 minorVersion B16; /* minor version of DGA protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of DGA protocol */
+ CARD16 minorVersion; /* minor version of DGA protocol */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86DGAQueryVersionReply;
#define sz_xXF86DGAQueryVersionReply 32
typedef struct _XF86DGAGetVideoLL {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGAGetVideoLL */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86DGAGetVideoLLReq;
#define sz_xXF86DGAGetVideoLLReq 8
typedef struct _XF86DGAInstallColormap{
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD16 screen B16;
+ CARD16 length;
+ CARD16 screen;
CARD16 pad2;
- CARD32 id B32; /* colormap. */
+ CARD32 id; /* colormap. */
} xXF86DGAInstallColormapReq;
#define sz_xXF86DGAInstallColormapReq 12
@@ -55,23 +55,23 @@ typedef struct _XF86DGAInstallColormap{
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32;
- CARD32 width B32;
- CARD32 bank_size B32;
- CARD32 ram_size B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 offset;
+ CARD32 width;
+ CARD32 bank_size;
+ CARD32 ram_size;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86DGAGetVideoLLReply;
#define sz_xXF86DGAGetVideoLLReply 32
typedef struct _XF86DGADirectVideo {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGADirectVideo */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 enable B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 enable;
} xXF86DGADirectVideoReq;
#define sz_xXF86DGADirectVideoReq 8
@@ -79,57 +79,57 @@ typedef struct _XF86DGADirectVideo {
typedef struct _XF86DGAGetViewPortSize {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGAGetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86DGAGetViewPortSizeReq;
#define sz_xXF86DGAGetViewPortSizeReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 width;
+ CARD32 height;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86DGAGetViewPortSizeReply;
#define sz_xXF86DGAGetViewPortSizeReply 32
typedef struct _XF86DGASetViewPort {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGASetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 x B32;
- CARD32 y B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 x;
+ CARD32 y;
} xXF86DGASetViewPortReq;
#define sz_xXF86DGASetViewPortReq 16
typedef struct _XF86DGAGetVidPage {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGAGetVidPage */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86DGAGetVidPageReq;
#define sz_xXF86DGAGetVidPageReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 vpage B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 vpage;
+ CARD32 pad;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86DGAGetVidPageReply;
#define sz_xXF86DGAGetVidPageReply 32
@@ -137,9 +137,9 @@ typedef struct {
typedef struct _XF86DGASetVidPage {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_XF86DGASetVidPage */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 vpage B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 vpage;
} xXF86DGASetVidPageReq;
#define sz_xXF86DGASetVidPageReq 8
@@ -147,23 +147,23 @@ typedef struct _XF86DGASetVidPage {
typedef struct _XF86DGAQueryDirectVideo {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86DGAQueryDirectVideoReq;
#define sz_xXF86DGAQueryDirectVideoReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 flags B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 flags;
+ CARD32 pad;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86DGAQueryDirectVideoReply;
#define sz_xXF86DGAQueryDirectVideoReply 32
@@ -171,23 +171,23 @@ typedef struct {
typedef struct _XF86DGAViewPortChanged {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 n B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 n;
} xXF86DGAViewPortChangedReq;
#define sz_xXF86DGAViewPortChangedReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 result B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 result;
+ CARD32 pad;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86DGAViewPortChangedReply;
#define sz_xXF86DGAViewPortChangedReply 32
diff --git a/include/X11/extensions/xf86dgaproto.h b/include/X11/extensions/xf86dgaproto.h
index 8d2fb64..2e8a712 100644
--- a/include/X11/extensions/xf86dgaproto.h
+++ b/include/X11/extensions/xf86dgaproto.h
@@ -20,44 +20,44 @@ Copyright (c) 1995 XFree86 Inc.
typedef struct _XDGAQueryVersion {
CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXDGAQueryVersionReq;
#define sz_xXDGAQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of DGA protocol */
- CARD16 minorVersion B16; /* minor version of DGA protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of DGA protocol */
+ CARD16 minorVersion; /* minor version of DGA protocol */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXDGAQueryVersionReply;
#define sz_xXDGAQueryVersionReply 32
typedef struct _XDGAQueryModes {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXDGAQueryModesReq;
#define sz_xXDGAQueryModesReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 number B32; /* number of modes available */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 number; /* number of modes available */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXDGAQueryModesReply;
#define sz_xXDGAQueryModesReply 32
@@ -65,77 +65,77 @@ typedef struct {
typedef struct _XDGASetMode {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 mode B32; /* mode number to init */
- CARD32 pid B32; /* Pixmap descriptor */
+ CARD16 length;
+ CARD32 screen;
+ CARD32 mode; /* mode number to init */
+ CARD32 pid; /* Pixmap descriptor */
} xXDGASetModeReq;
#define sz_xXDGASetModeReq 16
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32; /* offset into framebuffer map */
- CARD32 flags B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 offset; /* offset into framebuffer map */
+ CARD32 flags;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXDGASetModeReply;
#define sz_xXDGASetModeReply 32
typedef struct {
CARD8 byte_order;
CARD8 depth;
- CARD16 num B16;
- CARD16 bpp B16;
- CARD16 name_size B16;
- CARD32 vsync_num B32;
- CARD32 vsync_den B32;
- CARD32 flags B32;
- CARD16 image_width B16;
- CARD16 image_height B16;
- CARD16 pixmap_width B16;
- CARD16 pixmap_height B16;
- CARD32 bytes_per_scanline B32;
- CARD32 red_mask B32;
- CARD32 green_mask B32;
- CARD32 blue_mask B32;
- CARD16 visual_class B16;
- CARD16 pad1 B16;
- CARD16 viewport_width B16;
- CARD16 viewport_height B16;
- CARD16 viewport_xstep B16;
- CARD16 viewport_ystep B16;
- CARD16 viewport_xmax B16;
- CARD16 viewport_ymax B16;
- CARD32 viewport_flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
+ CARD16 num;
+ CARD16 bpp;
+ CARD16 name_size;
+ CARD32 vsync_num;
+ CARD32 vsync_den;
+ CARD32 flags;
+ CARD16 image_width;
+ CARD16 image_height;
+ CARD16 pixmap_width;
+ CARD16 pixmap_height;
+ CARD32 bytes_per_scanline;
+ CARD32 red_mask;
+ CARD32 green_mask;
+ CARD32 blue_mask;
+ CARD16 visual_class;
+ CARD16 pad1;
+ CARD16 viewport_width;
+ CARD16 viewport_height;
+ CARD16 viewport_xstep;
+ CARD16 viewport_ystep;
+ CARD16 viewport_xmax;
+ CARD16 viewport_ymax;
+ CARD32 viewport_flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
} xXDGAModeInfo;
#define sz_xXDGAModeInfo 72
typedef struct _XDGAOpenFramebuffer {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXDGAOpenFramebufferReq;
#define sz_xXDGAOpenFramebufferReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* device name size if there is one */
- CARD32 mem1 B32; /* physical memory */
- CARD32 mem2 B32; /* spillover for _alpha_ */
- CARD32 size B32; /* size of map in bytes */
- CARD32 offset B32; /* optional offset into device */
- CARD32 extra B32; /* extra info associated with the map */
- CARD32 pad2 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* device name size if there is one */
+ CARD32 mem1; /* physical memory */
+ CARD32 mem2; /* spillover for _alpha_ */
+ CARD32 size; /* size of map in bytes */
+ CARD32 offset; /* optional offset into device */
+ CARD32 extra; /* extra info associated with the map */
+ CARD32 pad2;
} xXDGAOpenFramebufferReply;
#define sz_xXDGAOpenFramebufferReply 32
@@ -143,8 +143,8 @@ typedef struct {
typedef struct _XDGACloseFramebuffer {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXDGACloseFramebufferReq;
#define sz_xXDGACloseFramebufferReq 8
@@ -152,11 +152,11 @@ typedef struct _XDGACloseFramebuffer {
typedef struct _XDGASetViewport {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 flags B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD16 x;
+ CARD16 y;
+ CARD32 flags;
} xXDGASetViewportReq;
#define sz_xXDGASetViewportReq 16
@@ -164,31 +164,31 @@ typedef struct _XDGASetViewport {
typedef struct _XDGAInstallColormap {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 cmap B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 cmap;
} xXDGAInstallColormapReq;
#define sz_xXDGAInstallColormapReq 12
typedef struct _XDGASelectInput {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 mask B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 mask;
} xXDGASelectInputReq;
#define sz_xXDGASelectInputReq 12
typedef struct _XDGAFillRectangle {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 color B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD16 x;
+ CARD16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD32 color;
} xXDGAFillRectangleReq;
#define sz_xXDGAFillRectangleReq 20
@@ -196,29 +196,29 @@ typedef struct _XDGAFillRectangle {
typedef struct _XDGACopyArea {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 srcx B16;
- CARD16 srcy B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 dstx B16;
- CARD16 dsty B16;
+ CARD16 length;
+ CARD32 screen;
+ CARD16 srcx;
+ CARD16 srcy;
+ CARD16 width;
+ CARD16 height;
+ CARD16 dstx;
+ CARD16 dsty;
} xXDGACopyAreaReq;
#define sz_xXDGACopyAreaReq 20
typedef struct _XDGACopyTransparentArea {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 srcx B16;
- CARD16 srcy B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 dstx B16;
- CARD16 dsty B16;
- CARD32 key B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD16 srcx;
+ CARD16 srcy;
+ CARD16 width;
+ CARD16 height;
+ CARD16 dstx;
+ CARD16 dsty;
+ CARD32 key;
} xXDGACopyTransparentAreaReq;
#define sz_xXDGACopyTransparentAreaReq 24
@@ -226,53 +226,53 @@ typedef struct _XDGACopyTransparentArea {
typedef struct _XDGAGetViewportStatus {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXDGAGetViewportStatusReq;
#define sz_xXDGAGetViewportStatusReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXDGAGetViewportStatusReply;
#define sz_xXDGAGetViewportStatusReply 32
typedef struct _XDGASync {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 screen;
} xXDGASyncReq;
#define sz_xXDGASyncReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXDGASyncReply;
#define sz_xXDGASyncReply 32
typedef struct _XDGASetClientVersion {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
+ CARD16 length;
+ CARD16 major;
+ CARD16 minor;
} xXDGASetClientVersionReq;
#define sz_xXDGASetClientVersionReq 8
@@ -280,36 +280,36 @@ typedef struct _XDGASetClientVersion {
typedef struct {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 flags B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD16 x;
+ CARD16 y;
+ CARD32 flags;
} xXDGAChangePixmapModeReq;
#define sz_xXDGAChangePixmapModeReq 16
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 x;
+ CARD16 y;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+ CARD32 pad7;
} xXDGAChangePixmapModeReply;
#define sz_xXDGAChangePixmapModeReply 32
typedef struct _XDGACreateColormap {
CARD8 reqType;
CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 id B32;
- CARD32 mode B32;
+ CARD16 length;
+ CARD32 screen;
+ CARD32 id;
+ CARD32 mode;
CARD8 alloc;
CARD8 pad1;
CARD16 pad2;
@@ -322,19 +322,19 @@ typedef struct {
struct {
BYTE type;
BYTE detail;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
} u;
struct {
- CARD32 pad0 B32;
- CARD32 time B32;
- INT16 dx B16;
- INT16 dy B16;
- INT16 screen B16;
- CARD16 state B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD32 pad0;
+ CARD32 time;
+ INT16 dx;
+ INT16 dy;
+ INT16 screen;
+ CARD16 state;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} event;
} u;
} dgaEvent;
diff --git a/include/X11/extensions/xf86mscstr.h b/include/X11/extensions/xf86mscstr.h
index 9eab965..cc0f0cf 100644
--- a/include/X11/extensions/xf86mscstr.h
+++ b/include/X11/extensions/xf86mscstr.h
@@ -19,22 +19,22 @@
typedef struct _XF86MiscQueryVersion {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86MiscQueryVersionReq;
#define sz_xXF86MiscQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of XFree86-Misc */
- CARD16 minorVersion B16; /* minor version of XFree86-Misc */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of XFree86-Misc */
+ CARD16 minorVersion; /* minor version of XFree86-Misc */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86MiscQueryVersionReply;
#define sz_xXF86MiscQueryVersionReply 32
@@ -42,34 +42,34 @@ typedef struct {
typedef struct _XF86MiscGetSaver {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86MiscGetSaverReq;
#define sz_xXF86MiscGetSaverReq 8
typedef struct _XF86MiscSetSaver {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscSetSaver */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 suspendTime B32;
- CARD32 offTime B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 suspendTime;
+ CARD32 offTime;
} xXF86MiscSetSaverReq;
#define sz_xXF86MiscSetSaverReq 16
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 suspendTime B32;
- CARD32 offTime B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 suspendTime;
+ CARD32 offTime;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86MiscGetSaverReply;
#define sz_xXF86MiscGetSaverReply 32
#endif
@@ -77,161 +77,161 @@ typedef struct {
typedef struct _XF86MiscGetMouseSettings {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscGetMouseSettings */
- CARD16 length B16;
+ CARD16 length;
} xXF86MiscGetMouseSettingsReq;
#define sz_xXF86MiscGetMouseSettingsReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 mousetype B32;
- CARD32 baudrate B32;
- CARD32 samplerate B32;
- CARD32 resolution B32;
- CARD32 buttons B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 mousetype;
+ CARD32 baudrate;
+ CARD32 samplerate;
+ CARD32 resolution;
+ CARD32 buttons;
BOOL emulate3buttons;
BOOL chordmiddle;
- CARD16 pad2 B16;
- CARD32 emulate3timeout B32;
- CARD32 flags B32;
- CARD32 devnamelen B32; /* strlen(device)+1 */
+ CARD16 pad2;
+ CARD32 emulate3timeout;
+ CARD32 flags;
+ CARD32 devnamelen; /* strlen(device)+1 */
} xXF86MiscGetMouseSettingsReply;
#define sz_xXF86MiscGetMouseSettingsReply 44
typedef struct _XF86MiscGetKbdSettings {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscGetKbdSettings */
- CARD16 length B16;
+ CARD16 length;
} xXF86MiscGetKbdSettingsReq;
#define sz_xXF86MiscGetKbdSettingsReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 kbdtype B32;
- CARD32 rate B32;
- CARD32 delay B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 kbdtype;
+ CARD32 rate;
+ CARD32 delay;
BOOL servnumlock;
BOOL pad2;
- CARD16 pad3 B16;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86MiscGetKbdSettingsReply;
#define sz_xXF86MiscGetKbdSettingsReply 32
typedef struct _XF86MiscSetMouseSettings {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscSetMouseSettings */
- CARD16 length B16;
- CARD32 mousetype B32;
- CARD32 baudrate B32;
- CARD32 samplerate B32;
- CARD32 resolution B32;
- CARD32 buttons B32;
+ CARD16 length;
+ CARD32 mousetype;
+ CARD32 baudrate;
+ CARD32 samplerate;
+ CARD32 resolution;
+ CARD32 buttons;
BOOL emulate3buttons;
BOOL chordmiddle;
- CARD16 devnamelen B16;
- CARD32 emulate3timeout B32;
- CARD32 flags B32;
+ CARD16 devnamelen;
+ CARD32 emulate3timeout;
+ CARD32 flags;
} xXF86MiscSetMouseSettingsReq;
#define sz_xXF86MiscSetMouseSettingsReq 36
typedef struct _XF86MiscSetKbdSettings {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */
- CARD16 length B16;
- CARD32 kbdtype B32;
- CARD32 rate B32;
- CARD32 delay B32;
+ CARD16 length;
+ CARD32 kbdtype;
+ CARD32 rate;
+ CARD32 delay;
BOOL servnumlock;
BOOL pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xXF86MiscSetKbdSettingsReq;
#define sz_xXF86MiscSetKbdSettingsReq 20
typedef struct _XF86MiscSetGrabKeysState {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */
- CARD16 length B16;
+ CARD16 length;
BOOL enable;
BOOL pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xXF86MiscSetGrabKeysStateReq;
#define sz_xXF86MiscSetGrabKeysStateReq 8
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86MiscSetGrabKeysStateReply;
#define sz_xXF86MiscSetGrabKeysStateReply 32
typedef struct _XF86MiscSetClientVersion {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
+ CARD16 length;
+ CARD16 major;
+ CARD16 minor;
} xXF86MiscSetClientVersionReq;
#define sz_xXF86MiscSetClientVersionReq 8
typedef struct _XF86MiscGetFilePaths {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */
- CARD16 length B16;
+ CARD16 length;
} xXF86MiscGetFilePathsReq;
#define sz_xXF86MiscGetFilePathsReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 configlen B16;
- CARD16 modulelen B16;
- CARD16 loglen B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 configlen;
+ CARD16 modulelen;
+ CARD16 loglen;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86MiscGetFilePathsReply;
#define sz_xXF86MiscGetFilePathsReply 32
typedef struct _XF86MiscPassMessage {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscPassMessage */
- CARD16 length B16;
- CARD16 typelen B16;
- CARD16 vallen B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 typelen;
+ CARD16 vallen;
+ CARD16 screen;
+ CARD16 pad;
} xXF86MiscPassMessageReq;
#define sz_xXF86MiscPassMessageReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 mesglen B16;
- CARD16 pad2 B16;
- CARD32 status B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 mesglen;
+ CARD16 pad2;
+ CARD32 status;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86MiscPassMessageReply;
#define sz_xXF86MiscPassMessageReply 32
diff --git a/include/X11/extensions/xf86rushstr.h b/include/X11/extensions/xf86rushstr.h
index 8dca46a..7c31a8a 100644
--- a/include/X11/extensions/xf86rushstr.h
+++ b/include/X11/extensions/xf86rushstr.h
@@ -18,73 +18,73 @@ Copyright (c) 1998 Daryll Strauss
typedef struct _XF86RushQueryVersion {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86RushQueryVersionReq;
#define sz_xXF86RushQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Rush protocol */
- CARD16 minorVersion B16; /* minor version of Rush protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of Rush protocol */
+ CARD16 minorVersion; /* minor version of Rush protocol */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86RushQueryVersionReply;
#define sz_xXF86RushQueryVersionReply 32
typedef struct _XF86RushLockPixmap {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushLockPixmap */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pixmap B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 pixmap;
} xXF86RushLockPixmapReq;
#define sz_xXF86RushLockPixmapReq 12
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 addr B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 addr;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86RushLockPixmapReply;
#define sz_xXF86RushLockPixmapReply 32
typedef struct _XF86RushUnlockPixmap {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushUnlockPixmap */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pixmap B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 pixmap;
} xXF86RushUnlockPixmapReq;
#define sz_xXF86RushUnlockPixmapReq 12
typedef struct _XF86RushUnlockAllPixmaps {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushUnlockAllPixmaps */
- CARD16 length B16;
+ CARD16 length;
} xXF86RushUnlockAllPixmapsReq;
#define sz_xXF86RushUnlockAllPixmapsReq 4
typedef struct _XF86RushSetCopyMode {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushSetCopyMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 CopyMode B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 CopyMode;
} xXF86RushSetCopyModeReq;
#define sz_xXF86RushSetCopyModeReq 12
@@ -92,71 +92,71 @@ typedef struct _XF86RushSetCopyMode {
typedef struct _XF86RushSetPixelStride {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushSetCopyMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 PixelStride B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 PixelStride;
} xXF86RushSetPixelStrideReq;
#define sz_xXF86RushSetPixelStrideReq 12
typedef struct {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushOverlayPixmap */
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- Pixmap pixmap B32;
- CARD32 id B32;
- INT16 src_x B16;
- INT16 src_y B16;
- CARD16 src_w B16;
- CARD16 src_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
+ CARD16 length;
+ XvPortID port;
+ Drawable drawable;
+ GContext gc;
+ Pixmap pixmap;
+ CARD32 id;
+ INT16 src_x;
+ INT16 src_y;
+ CARD16 src_w;
+ CARD16 src_h;
+ INT16 drw_x;
+ INT16 drw_y;
+ CARD16 drw_w;
+ CARD16 drw_h;
} xXF86RushOverlayPixmapReq;
#define sz_xXF86RushOverlayPixmapReq 40
typedef struct _XF86RushStatusRegOffset {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushStatusRegOffset */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86RushStatusRegOffsetReq;
#define sz_xXF86RushStatusRegOffsetReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32; /* Offset of Rush status reg in mem */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 offset; /* Offset of Rush status reg in mem */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86RushStatusRegOffsetReply;
#define sz_xXF86RushStatusRegOffsetReply 32
typedef struct _XF86RushAT3DEnableRegs {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushAT3DEnableRegs */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86RushAT3DEnableRegsReq;
#define sz_xXF86RushAT3DEnableRegsReq 8
typedef struct _XF86RushAT3DDisableRegs {
CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushAT3DDisableRegs */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86RushAT3DDisableRegsReq;
#define sz_xXF86RushAT3DDisableRegsReq 8
diff --git a/include/X11/extensions/xf86vmproto.h b/include/X11/extensions/xf86vmproto.h
index 4c7966f..7307284 100644
--- a/include/X11/extensions/xf86vmproto.h
+++ b/include/X11/extensions/xf86vmproto.h
@@ -72,31 +72,31 @@ from Kaleb S. KEITHLEY
typedef struct _XF86VidModeQueryVersion {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeQueryVersion */
- CARD16 length B16;
+ CARD16 length;
} xXF86VidModeQueryVersionReq;
#define sz_xXF86VidModeQueryVersionReq 4
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of XF86VidMode */
- CARD16 minorVersion B16; /* minor version of XF86VidMode */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion; /* major version of XF86VidMode */
+ CARD16 minorVersion; /* minor version of XF86VidMode */
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86VidModeQueryVersionReply;
#define sz_xXF86VidModeQueryVersionReply 32
typedef struct _XF86VidModeGetModeLine {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86VidModeGetModeLineReq,
xXF86VidModeGetAllModeLinesReq,
xXF86VidModeGetMonitorReq,
@@ -113,24 +113,24 @@ typedef struct _XF86VidModeGetModeLine {
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad2 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 hskew;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD16 pad2;
+ CARD32 flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
+ CARD32 reserved3;
+ CARD32 privsize;
} xXF86VidModeGetModeLineReply;
#define sz_xXF86VidModeGetModeLineReply 52
@@ -138,106 +138,106 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD32 flags;
+ CARD32 privsize;
} xXF86OldVidModeGetModeLineReply;
#define sz_xXF86OldVidModeGetModeLineReply 36
typedef struct {
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD32 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD32 hskew;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD16 pad1;
+ CARD32 flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
+ CARD32 reserved3;
+ CARD32 privsize;
} xXF86VidModeModeInfo;
/* 0.x version */
typedef struct {
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD32 flags;
+ CARD32 privsize;
} xXF86OldVidModeModeInfo;
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 modecount B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 modecount;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86VidModeGetAllModeLinesReply;
#define sz_xXF86VidModeGetAllModeLinesReply 32
typedef struct _XF86VidModeAddModeLine {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
- CARD32 after_dotclock B32;
- CARD16 after_hdisplay B16;
- CARD16 after_hsyncstart B16;
- CARD16 after_hsyncend B16;
- CARD16 after_htotal B16;
- CARD16 after_hskew B16;
- CARD16 after_vdisplay B16;
- CARD16 after_vsyncstart B16;
- CARD16 after_vsyncend B16;
- CARD16 after_vtotal B16;
- CARD16 pad2 B16;
- CARD32 after_flags B32;
- CARD32 reserved4 B32;
- CARD32 reserved5 B32;
- CARD32 reserved6 B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 hskew;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD16 pad1;
+ CARD32 flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
+ CARD32 reserved3;
+ CARD32 privsize;
+ CARD32 after_dotclock;
+ CARD16 after_hdisplay;
+ CARD16 after_hsyncstart;
+ CARD16 after_hsyncend;
+ CARD16 after_htotal;
+ CARD16 after_hskew;
+ CARD16 after_vdisplay;
+ CARD16 after_vsyncstart;
+ CARD16 after_vsyncend;
+ CARD16 after_vtotal;
+ CARD16 pad2;
+ CARD32 after_flags;
+ CARD32 reserved4;
+ CARD32 reserved5;
+ CARD32 reserved6;
} xXF86VidModeAddModeLineReq;
#define sz_xXF86VidModeAddModeLineReq 92
@@ -245,52 +245,52 @@ typedef struct _XF86VidModeAddModeLine {
typedef struct _XF86OldVidModeAddModeLine {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
- CARD32 after_dotclock B32;
- CARD16 after_hdisplay B16;
- CARD16 after_hsyncstart B16;
- CARD16 after_hsyncend B16;
- CARD16 after_htotal B16;
- CARD16 after_vdisplay B16;
- CARD16 after_vsyncstart B16;
- CARD16 after_vsyncend B16;
- CARD16 after_vtotal B16;
- CARD32 after_flags B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD32 flags;
+ CARD32 privsize;
+ CARD32 after_dotclock;
+ CARD16 after_hdisplay;
+ CARD16 after_hsyncstart;
+ CARD16 after_hsyncend;
+ CARD16 after_htotal;
+ CARD16 after_vdisplay;
+ CARD16 after_vsyncstart;
+ CARD16 after_vsyncend;
+ CARD16 after_vtotal;
+ CARD32 after_flags;
} xXF86OldVidModeAddModeLineReq;
#define sz_xXF86OldVidModeAddModeLineReq 60
typedef struct _XF86VidModeModModeLine {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeModModeLine */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 hskew;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD16 pad1;
+ CARD32 flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
+ CARD32 reserved3;
+ CARD32 privsize;
} xXF86VidModeModModeLineReq;
#define sz_xXF86VidModeModModeLineReq 48
@@ -298,42 +298,42 @@ typedef struct _XF86VidModeModModeLine {
typedef struct _XF86OldVidModeModModeLine {
CARD8 reqType; /* always XF86OldVidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86OldVidModeModModeLine */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD32 flags;
+ CARD32 privsize;
} xXF86OldVidModeModModeLineReq;
#define sz_xXF86OldVidModeModModeLineReq 32
typedef struct _XF86VidModeValidateModeLine {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 hskew;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD16 pad1;
+ CARD32 flags;
+ CARD32 reserved1;
+ CARD32 reserved2;
+ CARD32 reserved3;
+ CARD32 privsize;
} xXF86VidModeDeleteModeLineReq,
xXF86VidModeValidateModeLineReq,
xXF86VidModeSwitchToModeReq;
@@ -345,19 +345,19 @@ typedef struct _XF86VidModeValidateModeLine {
typedef struct _XF86OldVidModeValidateModeLine {
CARD8 reqType; /* always XF86OldVidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
+ CARD16 length;
+ CARD32 screen; /* could be CARD16 but need the pad */
+ CARD32 dotclock;
+ CARD16 hdisplay;
+ CARD16 hsyncstart;
+ CARD16 hsyncend;
+ CARD16 htotal;
+ CARD16 vdisplay;
+ CARD16 vsyncstart;
+ CARD16 vsyncend;
+ CARD16 vtotal;
+ CARD32 flags;
+ CARD32 privsize;
} xXF86OldVidModeDeleteModeLineReq,
xXF86OldVidModeValidateModeLineReq,
xXF86OldVidModeSwitchToModeReq;
@@ -368,141 +368,141 @@ typedef struct _XF86OldVidModeValidateModeLine {
typedef struct _XF86VidModeSwitchMode {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSwitchMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 zoom B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 zoom;
} xXF86VidModeSwitchModeReq;
#define sz_xXF86VidModeSwitchModeReq 8
typedef struct _XF86VidModeLockModeSwitch {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeLockModeSwitch */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 lock B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 lock;
} xXF86VidModeLockModeSwitchReq;
#define sz_xXF86VidModeLockModeSwitchReq 8
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 status;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86VidModeValidateModeLineReply;
#define sz_xXF86VidModeValidateModeLineReply 32
typedef struct {
BYTE type; /* X_Reply */
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
CARD8 vendorLength;
CARD8 modelLength;
CARD8 nhsync;
CARD8 nvsync;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86VidModeGetMonitorReply;
#define sz_xXF86VidModeGetMonitorReply 32
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 x B32;
- CARD32 y B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 x;
+ CARD32 y;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86VidModeGetViewPortReply;
#define sz_xXF86VidModeGetViewPortReply 32
typedef struct _XF86VidModeSetViewPort {
CARD8 reqType; /* always VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 x B32;
- CARD32 y B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 x;
+ CARD32 y;
} xXF86VidModeSetViewPortReq;
#define sz_xXF86VidModeSetViewPortReq 16
typedef struct {
BYTE type;
BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 flags B32;
- CARD32 clocks B32;
- CARD32 maxclocks B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 flags;
+ CARD32 clocks;
+ CARD32 maxclocks;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xXF86VidModeGetDotClocksReply;
#define sz_xXF86VidModeGetDotClocksReply 32
typedef struct _XF86VidModeSetClientVersion {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
+ CARD16 length;
+ CARD16 major;
+ CARD16 minor;
} xXF86VidModeSetClientVersionReq;
#define sz_xXF86VidModeSetClientVersionReq 8
typedef struct _XF86VidModeGetGamma {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXF86VidModeGetGammaReq;
#define sz_xXF86VidModeGetGammaReq 32
typedef struct {
BYTE type;
BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 red B32;
- CARD32 green B32;
- CARD32 blue B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 red;
+ CARD32 green;
+ CARD32 blue;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xXF86VidModeGetGammaReply;
#define sz_xXF86VidModeGetGammaReply 32
typedef struct _XF86VidModeSetGamma {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 red B32;
- CARD32 green B32;
- CARD32 blue B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
+ CARD32 red;
+ CARD32 green;
+ CARD32 blue;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xXF86VidModeSetGammaReq;
#define sz_xXF86VidModeSetGammaReq 32
@@ -510,71 +510,71 @@ typedef struct _XF86VidModeSetGamma {
typedef struct _XF86VidModeSetGammaRamp {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 size B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 size;
} xXF86VidModeSetGammaRampReq;
#define sz_xXF86VidModeSetGammaRampReq 8
typedef struct _XF86VidModeGetGammaRamp {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 size B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 size;
} xXF86VidModeGetGammaRampReq;
#define sz_xXF86VidModeGetGammaRampReq 8
typedef struct {
BYTE type;
BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 size;
+ CARD16 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86VidModeGetGammaRampReply;
#define sz_xXF86VidModeGetGammaRampReply 32
typedef struct _XF86VidModeGetGammaRampSize {
CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
+ CARD16 length;
+ CARD16 screen;
+ CARD16 pad;
} xXF86VidModeGetGammaRampSizeReq;
#define sz_xXF86VidModeGetGammaRampSizeReq 8
typedef struct {
BYTE type;
BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 size;
+ CARD16 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86VidModeGetGammaRampSizeReply;
#define sz_xXF86VidModeGetGammaRampSizeReply 32
typedef struct {
BYTE type;
BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 permissions B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 permissions;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXF86VidModeGetPermissionsReply;
#define sz_xXF86VidModeGetPermissionsReply 32
diff --git a/include/X11/extensions/xfixesproto.h b/include/X11/extensions/xfixesproto.h
index 6a1c3a5..b18b306 100644
--- a/include/X11/extensions/xfixesproto.h
+++ b/include/X11/extensions/xfixesproto.h
@@ -69,7 +69,7 @@
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
+ CARD16 length;
} xXFixesReq;
/*
@@ -78,9 +78,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
+ CARD16 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
} xXFixesQueryVersionReq;
#define sz_xXFixesQueryVersionReq 12
@@ -88,14 +88,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 majorVersion;
+ CARD32 minorVersion;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXFixesQueryVersionReply;
#define sz_xXFixesQueryVersionReply 32
@@ -103,7 +103,7 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
+ CARD16 length;
BYTE mode; /* SetModeInsert/SetModeDelete*/
BYTE target; /* SaveSetNearest/SaveSetRoot*/
BYTE map; /* SaveSetMap/SaveSetUnmap */
@@ -116,10 +116,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Window window B32;
- Atom selection B32;
- CARD32 eventMask B32;
+ CARD16 length;
+ Window window;
+ Atom selection;
+ CARD32 eventMask;
} xXFixesSelectSelectionInputReq;
#define sz_xXFixesSelectSelectionInputReq 16
@@ -127,22 +127,22 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 subtype;
- CARD16 sequenceNumber B16;
- Window window B32;
- Window owner B32;
- Atom selection B32;
- Time timestamp B32;
- Time selectionTimestamp B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ Window window;
+ Window owner;
+ Atom selection;
+ Time timestamp;
+ Time selectionTimestamp;
+ CARD32 pad2;
+ CARD32 pad3;
} xXFixesSelectionNotifyEvent;
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Window window B32;
- CARD32 eventMask B32;
+ CARD16 length;
+ Window window;
+ CARD32 eventMask;
} xXFixesSelectCursorInputReq;
#define sz_xXFixesSelectCursorInputReq 12
@@ -150,20 +150,20 @@ typedef struct {
typedef struct {
CARD8 type;
CARD8 subtype;
- CARD16 sequenceNumber B16;
- Window window B32;
- CARD32 cursorSerial B32;
+ CARD16 sequenceNumber;
+ Window window;
+ CARD32 cursorSerial;
Time timestamp;
- Atom name B32; /* Version 2 */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ Atom name; /* Version 2 */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xXFixesCursorNotifyEvent;
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
+ CARD16 length;
} xXFixesGetCursorImageReq;
#define sz_xXFixesGetCursorImageReq 4
@@ -171,17 +171,17 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 xhot B16;
- CARD16 yhot B16;
- CARD32 cursorSerial B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD16 xhot;
+ CARD16 yhot;
+ CARD32 cursorSerial;
+ CARD32 pad2;
+ CARD32 pad3;
} xXFixesGetCursorImageReply;
#define sz_xXFixesGetCursorImageReply 32
@@ -193,8 +193,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
+ CARD16 length;
+ Region region;
/* LISTofRECTANGLE */
} xXFixesCreateRegionReq;
@@ -203,9 +203,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
- Pixmap bitmap B32;
+ CARD16 length;
+ Region region;
+ Pixmap bitmap;
} xXFixesCreateRegionFromBitmapReq;
#define sz_xXFixesCreateRegionFromBitmapReq 12
@@ -213,12 +213,12 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
- Window window B32;
+ CARD16 length;
+ Region region;
+ Window window;
CARD8 kind;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} xXFixesCreateRegionFromWindowReq;
#define sz_xXFixesCreateRegionFromWindowReq 16
@@ -226,9 +226,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
- GContext gc B32;
+ CARD16 length;
+ Region region;
+ GContext gc;
} xXFixesCreateRegionFromGCReq;
#define sz_xXFixesCreateRegionFromGCReq 12
@@ -236,9 +236,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
- Picture picture B32;
+ CARD16 length;
+ Region region;
+ Picture picture;
} xXFixesCreateRegionFromPictureReq;
#define sz_xXFixesCreateRegionFromPictureReq 12
@@ -246,8 +246,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
+ CARD16 length;
+ Region region;
} xXFixesDestroyRegionReq;
#define sz_xXFixesDestroyRegionReq 8
@@ -255,8 +255,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
+ CARD16 length;
+ Region region;
/* LISTofRECTANGLE */
} xXFixesSetRegionReq;
@@ -265,9 +265,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region source B32;
- Region destination B32;
+ CARD16 length;
+ Region source;
+ Region destination;
} xXFixesCopyRegionReq;
#define sz_xXFixesCopyRegionReq 12
@@ -275,10 +275,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region source1 B32;
- Region source2 B32;
- Region destination B32;
+ CARD16 length;
+ Region source1;
+ Region source2;
+ Region destination;
} xXFixesCombineRegionReq,
xXFixesUnionRegionReq,
xXFixesIntersectRegionReq,
@@ -292,11 +292,11 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region source B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- Region destination B32;
+ CARD16 length;
+ Region source;
+ INT16 x, y;
+ CARD16 width, height;
+ Region destination;
} xXFixesInvertRegionReq;
#define sz_xXFixesInvertRegionReq 20
@@ -304,9 +304,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
- INT16 dx B16, dy B16;
+ CARD16 length;
+ Region region;
+ INT16 dx, dy;
} xXFixesTranslateRegionReq;
#define sz_xXFixesTranslateRegionReq 12
@@ -314,9 +314,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region source B32;
- Region destination B32;
+ CARD16 length;
+ Region source;
+ Region destination;
} xXFixesRegionExtentsReq;
#define sz_xXFixesRegionExtentsReq 12
@@ -324,8 +324,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region region B32;
+ CARD16 length;
+ Region region;
} xXFixesFetchRegionReq;
#define sz_xXFixesFetchRegionReq 8
@@ -333,14 +333,14 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT16 x, y;
+ CARD16 width, height;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXFixesFetchRegionReply;
#define sz_xXFixesFetchRegionReply 32
@@ -348,10 +348,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- GContext gc B32;
- Region region B32;
- INT16 xOrigin B16, yOrigin B16;
+ CARD16 length;
+ GContext gc;
+ Region region;
+ INT16 xOrigin, yOrigin;
} xXFixesSetGCClipRegionReq;
#define sz_xXFixesSetGCClipRegionReq 16
@@ -359,12 +359,12 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
+ CARD16 length;
Window dest;
BYTE destKind;
CARD8 pad1;
- CARD16 pad2 B16;
- INT16 xOff B16, yOff B16;
+ CARD16 pad2;
+ INT16 xOff, yOff;
Region region;
} xXFixesSetWindowShapeRegionReq;
@@ -373,10 +373,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Picture picture B32;
- Region region B32;
- INT16 xOrigin B16, yOrigin B16;
+ CARD16 length;
+ Picture picture;
+ Region region;
+ INT16 xOrigin, yOrigin;
} xXFixesSetPictureClipRegionReq;
#define sz_xXFixesSetPictureClipRegionReq 16
@@ -384,10 +384,10 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Cursor cursor B32;
- CARD16 nbytes B16;
- CARD16 pad B16;
+ CARD16 length;
+ Cursor cursor;
+ CARD16 nbytes;
+ CARD16 pad;
} xXFixesSetCursorNameReq;
#define sz_xXFixesSetCursorNameReq 12
@@ -395,8 +395,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Cursor cursor B32;
+ CARD16 length;
+ Cursor cursor;
} xXFixesGetCursorNameReq;
#define sz_xXFixesGetCursorNameReq 8
@@ -404,15 +404,15 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom atom B32;
- CARD16 nbytes B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ Atom atom;
+ CARD16 nbytes;
+ CARD16 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXFixesGetCursorNameReply;
#define sz_xXFixesGetCursorNameReply 32
@@ -420,7 +420,7 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
+ CARD16 length;
} xXFixesGetCursorImageAndNameReq;
#define sz_xXFixesGetCursorImageAndNameReq 4
@@ -428,18 +428,18 @@ typedef struct {
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 xhot B16;
- CARD16 yhot B16;
- CARD32 cursorSerial B32;
- Atom cursorName B32;
- CARD16 nbytes B16;
- CARD16 pad B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ INT16 x;
+ INT16 y;
+ CARD16 width;
+ CARD16 height;
+ CARD16 xhot;
+ CARD16 yhot;
+ CARD32 cursorSerial;
+ Atom cursorName;
+ CARD16 nbytes;
+ CARD16 pad;
} xXFixesGetCursorImageAndNameReply;
#define sz_xXFixesGetCursorImageAndNameReply 32
@@ -447,9 +447,9 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Cursor source B32;
- Cursor destination B32;
+ CARD16 length;
+ Cursor source;
+ Cursor destination;
} xXFixesChangeCursorReq;
#define sz_xXFixesChangeCursorReq 12
@@ -457,8 +457,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Cursor source B32;
+ CARD16 length;
+ Cursor source;
CARD16 nbytes;
CARD16 pad;
} xXFixesChangeCursorByNameReq;
@@ -470,13 +470,13 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Region source B32;
- Region destination B32;
- CARD16 left B16;
- CARD16 right B16;
- CARD16 top B16;
- CARD16 bottom B16;
+ CARD16 length;
+ Region source;
+ Region destination;
+ CARD16 left;
+ CARD16 right;
+ CARD16 top;
+ CARD16 bottom;
} xXFixesExpandRegionReq;
#define sz_xXFixesExpandRegionReq 20
@@ -486,8 +486,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xXFixesHideCursorReq;
#define sz_xXFixesHideCursorReq sizeof(xXFixesHideCursorReq)
@@ -495,8 +495,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Window window B32;
+ CARD16 length;
+ Window window;
} xXFixesShowCursorReq;
#define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq)
@@ -508,16 +508,16 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Barrier barrier B32;
- Window window B32;
- INT16 x1 B16;
- INT16 y1 B16;
- INT16 x2 B16;
- INT16 y2 B16;
+ CARD16 length;
+ Barrier barrier;
+ Window window;
+ INT16 x1;
+ INT16 y1;
+ INT16 x2;
+ INT16 y2;
CARD32 directions;
- CARD16 pad B16;
- CARD16 num_devices B16;
+ CARD16 pad;
+ CARD16 num_devices;
/* array of CARD16 devices */
} xXFixesCreatePointerBarrierReq;
@@ -526,8 +526,8 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
- CARD16 length B16;
- Barrier barrier B32;
+ CARD16 length;
+ Barrier barrier;
} xXFixesDestroyPointerBarrierReq;
#define sz_xXFixesDestroyPointerBarrierReq 8
diff --git a/include/X11/extensions/xtestext1proto.h b/include/X11/extensions/xtestext1proto.h
index e9bdee0..d14ace1 100644
--- a/include/X11/extensions/xtestext1proto.h
+++ b/include/X11/extensions/xtestext1proto.h
@@ -79,8 +79,8 @@ University of California.
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestFakeInput */
- CARD16 length B16; /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */
- CARD32 ack B32;
+ CARD16 length; /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */
+ CARD32 ack;
CARD8 action_list[XTestMAX_ACTION_LIST_SIZE];
} xTestFakeInputReq;
#define sz_xTestFakeInputReq (XTestMAX_ACTION_LIST_SIZE + 8)
@@ -88,29 +88,29 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestGetInput */
- CARD16 length B16; /* 2 */
- CARD32 mode B32;
+ CARD16 length; /* 2 */
+ CARD32 mode;
} xTestGetInputReq;
#define sz_xTestGetInputReq 8
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestStopInput */
- CARD16 length B32; /* 1 */
+ CARD16 length; /* 1 */
} xTestStopInputReq;
#define sz_xTestStopInputReq 4
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestReset */
- CARD16 length B16; /* 1 */
+ CARD16 length; /* 1 */
} xTestResetReq;
#define sz_xTestResetReq 4
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestQueryInputSize */
- CARD16 length B16; /* 1 */
+ CARD16 length; /* 1 */
} xTestQueryInputSizeReq;
#define sz_xTestQueryInputSizeReq 4
@@ -122,14 +122,14 @@ typedef struct {
typedef struct {
CARD8 type; /* always X_Reply */
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* always 0 */
- CARD32 size_return B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length; /* always 0 */
+ CARD32 size_return;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xTestQueryInputSizeReply;
/*
@@ -141,7 +141,7 @@ typedef struct {
typedef struct {
CARD8 type; /* always XTestInputActionType */
CARD8 pad00;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber;
CARD8 actions[XTestACTIONS_SIZE];
} xTestInputActionEvent;
@@ -154,14 +154,14 @@ typedef struct {
typedef struct {
CARD8 type; /* always XTestFakeAckType */
CARD8 pad00;
- CARD16 sequenceNumber B16;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
- CARD32 pad05 B32;
- CARD32 pad06 B32;
- CARD32 pad07 B32;
- CARD32 pad08 B32;
+ CARD16 sequenceNumber;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
+ CARD32 pad05;
+ CARD32 pad06;
+ CARD32 pad07;
+ CARD32 pad08;
} xTestFakeAckEvent;
/*
@@ -170,7 +170,7 @@ typedef struct {
typedef struct {
CARD8 header; /* which device, key up/down */
CARD8 keycode; /* which key/button to move */
- CARD16 delay_time B16; /* how long to delay (in ms) */
+ CARD16 delay_time; /* how long to delay (in ms) */
} XTestKeyInfo;
/*
@@ -179,9 +179,9 @@ typedef struct {
typedef struct {
CARD8 header; /* which pointer */
CARD8 pad1; /* unused padding byte */
- CARD16 jumpx B16; /* x coord to jump to */
- CARD16 jumpy B16; /* y coord to jump to */
- CARD16 delay_time B16; /* how long to delay (in ms) */
+ CARD16 jumpx; /* x coord to jump to */
+ CARD16 jumpy; /* y coord to jump to */
+ CARD16 delay_time; /* how long to delay (in ms) */
} XTestJumpInfo;
/*
@@ -197,7 +197,7 @@ typedef struct {
typedef struct {
CARD8 header; /* which pointer */
CARD8 motion_data; /* x,y relative motion */
- CARD16 delay_time B16; /* how long to delay (in ms) */
+ CARD16 delay_time; /* how long to delay (in ms) */
} XTestMotionInfo;
/*
@@ -214,8 +214,8 @@ typedef struct {
typedef struct {
CARD8 header; /* always XTestDELAY_DEVICE_ID */
CARD8 pad1; /* unused padding byte */
- CARD16 pad2 B16; /* unused padding word */
- CARD32 delay_time B32; /* how long to delay (in ms) */
+ CARD16 pad2; /* unused padding word */
+ CARD32 delay_time; /* how long to delay (in ms) */
} XTestDelayInfo;
#endif /* _XTESTEXT1PROTO_H */
diff --git a/include/X11/extensions/xtestproto.h b/include/X11/extensions/xtestproto.h
index 4f8db26..9595ac1 100644
--- a/include/X11/extensions/xtestproto.h
+++ b/include/X11/extensions/xtestproto.h
@@ -41,48 +41,48 @@ in this Software without prior written authorization from The Open Group.
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestGetVersion */
- CARD16 length B16;
+ CARD16 length;
CARD8 majorVersion;
CARD8 pad;
- CARD16 minorVersion B16;
+ CARD16 minorVersion;
} xXTestGetVersionReq;
#define sz_xXTestGetVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 majorVersion;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 minorVersion B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 minorVersion;
+ CARD16 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXTestGetVersionReply;
#define sz_xXTestGetVersionReply 32
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestCompareCursor */
- CARD16 length B16;
- Window window B32;
- Cursor cursor B32;
+ CARD16 length;
+ Window window;
+ Cursor cursor;
} xXTestCompareCursorReq;
#define sz_xXTestCompareCursorReq 12
typedef struct {
BYTE type; /* X_Reply */
BOOL same;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXTestCompareCursorReply;
#define sz_xXTestCompareCursorReply 32
@@ -90,17 +90,17 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestFakeInput */
- CARD16 length B16;
+ CARD16 length;
BYTE type;
BYTE detail;
- CARD16 pad0 B16;
- Time time B32;
- Window root B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- INT16 rootX B16, rootY B16;
- CARD32 pad3 B32;
- CARD16 pad4 B16;
+ CARD16 pad0;
+ Time time;
+ Window root;
+ CARD32 pad1;
+ CARD32 pad2;
+ INT16 rootX, rootY;
+ CARD32 pad3;
+ CARD16 pad4;
CARD8 pad5;
CARD8 deviceid;
} xXTestFakeInputReq;
@@ -109,7 +109,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestGrabControl */
- CARD16 length B16;
+ CARD16 length;
BOOL impervious;
CARD8 pad0;
CARD8 pad1;
diff --git a/include/X11/extensions/xtrapddmi.h b/include/X11/extensions/xtrapddmi.h
index 12283f7..4515ca6 100644
--- a/include/X11/extensions/xtrapddmi.h
+++ b/include/X11/extensions/xtrapddmi.h
@@ -67,8 +67,8 @@ typedef struct
ClientPtr client; /* Multi-client support and error handling */
xXTrapGetCurReply cur; /* Struct of Miscellaneous state info */
xXTrapGetStatsReply *stats; /* Pointer to stat's, malloc'd if requested */
- CARD32 last_input_time B32; /* last timestamp from input event */
- CARD16 protocol B16; /* current communication protocol */
+ CARD32 last_input_time; /* last timestamp from input event */
+ CARD16 protocol; /* current communication protocol */
} XETrapEnv;
#define XETrapSetHeaderEvent(phdr) ((phdr)->type = 0x1L)
diff --git a/include/X11/extensions/xtrapdi.h b/include/X11/extensions/xtrapdi.h
index a0d8a88..26449bb 100644
--- a/include/X11/extensions/xtrapdi.h
+++ b/include/X11/extensions/xtrapdi.h
@@ -136,7 +136,7 @@ typedef struct
typedef struct /* used by XEConfigRequest */
{
XETrapFlags flags; /* Flags to specify what should be chg'd */
- CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */
+ CARD16 max_pkt_size; /* Maximum number of bytes in a packet */
CARD8 cmd_key; /* Keyboard command_key (KeyCode) */
/*
* cmd_key is intentionally *not* defined KeyCode since it's definition is
@@ -156,8 +156,8 @@ typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */
CARD8 detail; /* Detail keycode/button as in XEvent */
CARD8 screen; /* screen number (0 to n) */
CARD8 pad; /* pad to longword */
- INT16 x B16; /* X & Y coord as in XEvent */
- INT16 y B16;
+ INT16 x; /* X & Y coord as in XEvent */
+ INT16 y;
} XETrapInputReq;
#endif
@@ -184,8 +184,8 @@ typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
- CARD16 length B16;
- CARD32 pad B32; /* Maintain quadword alignment */
+ CARD16 length;
+ CARD32 pad; /* Maintain quadword alignment */
} xXTrapReq;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapReq (sizeof(xXTrapReq))
@@ -194,9 +194,9 @@ typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
- CARD16 length B16;
- CARD16 protocol B16; /* The xtrap extension protocol number */
- CARD16 pad B16; /* Maintain quadword alignment */
+ CARD16 length;
+ CARD16 protocol; /* The xtrap extension protocol number */
+ CARD16 pad; /* Maintain quadword alignment */
} xXTrapGetReq;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapGetReq (sizeof(xXTrapGetReq))
@@ -205,7 +205,7 @@ typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
- CARD16 length B16;
+ CARD16 length;
/*
* The follwing is done so that structure padding wont be
* a problem. The request structure contains a shadow for
@@ -220,7 +220,7 @@ typedef struct
ReqFlags config_flags_req;
EventFlags config_flags_event;
/* End Shadow (XETrapFlags)*/
- CARD16 config_max_pkt_size B16; /* Max number of bytes in a packet */
+ CARD16 config_max_pkt_size; /* Max number of bytes in a packet */
CARD8 config_cmd_key; /* Keyboard command_key (KeyCode) */
/*
* cmd_key is intentionally *not* defined KeyCode since it's definition is
@@ -228,7 +228,7 @@ typedef struct
*/
CARD8 config_pad[1L]; /* pad out to a quadword */
/* End Shadow (XETrapCfg) */
- CARD32 pad B32; /* Maintain quadword alignment */
+ CARD32 pad; /* Maintain quadword alignment */
} xXTrapConfigReq;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapConfigReq (sizeof(xXTrapConfigReq))
@@ -238,8 +238,8 @@ typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
- CARD16 length B16;
- CARD32 pad B32; /* Maintain quadword alignment */
+ CARD16 length;
+ CARD32 pad; /* Maintain quadword alignment */
XETrapInputReq input;
} xXTrapInputReq;
/* the following works because all fields are defined as bit (Bnn) fields */
@@ -256,48 +256,48 @@ typedef struct
{
CARD8 type;
CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
} XETrapRepHdr;
/* Structure of Get Available Functionality reply */
typedef struct
{
- CARD32 pf_ident B32; /* Contains constant identifying the platform */
- CARD16 xtrap_release B16; /* The xtrap extension release number */
- CARD16 xtrap_version B16; /* The xtrap extension version number */
- CARD16 xtrap_revision B16; /* The xtrap extension revision number */
- CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */
+ CARD32 pf_ident; /* Contains constant identifying the platform */
+ CARD16 xtrap_release; /* The xtrap extension release number */
+ CARD16 xtrap_version; /* The xtrap extension version number */
+ CARD16 xtrap_revision; /* The xtrap extension revision number */
+ CARD16 max_pkt_size; /* Maximum number of bytes in a packet */
CARD8 valid[4]; /* What specific configuration flags are valid */
- CARD32 major_opcode B32; /* The major opcode identifying xtrap */
- CARD32 event_base B32; /* The event value we start at */
- CARD32 pad0 B32; /* obsolete field */
- CARD16 pad1 B16, pad2 B16, pad3 B16; /* obsolete field */
- CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */
- INT16 cur_x B16; /* Current X & Y coord for relative motion */
- INT16 cur_y B16;
+ CARD32 major_opcode; /* The major opcode identifying xtrap */
+ CARD32 event_base; /* The event value we start at */
+ CARD32 pad0; /* obsolete field */
+ CARD16 pad1, pad2, pad3; /* obsolete field */
+ CARD16 xtrap_protocol; /* The xtrap extension protocol number */
+ INT16 cur_x; /* Current X & Y coord for relative motion */
+ INT16 cur_y;
} XETrapGetAvailRep;
typedef struct
{
- CARD16 xtrap_release B16; /* The xtrap extension release number */
- CARD16 xtrap_version B16; /* The xtrap extension version number */
- CARD16 xtrap_revision B16; /* The xtrap extension revision number */
- CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */
+ CARD16 xtrap_release; /* The xtrap extension release number */
+ CARD16 xtrap_version; /* The xtrap extension version number */
+ CARD16 xtrap_revision; /* The xtrap extension revision number */
+ CARD16 xtrap_protocol; /* The xtrap extension protocol number */
} XETrapGetVersRep;
typedef struct
{
- CARD32 last_time B32; /* Timestamp of last input time */
+ CARD32 last_time; /* Timestamp of last input time */
} XETrapGetLastInpTimeRep;
/* Structure of Get Current Configuration Information reply */
typedef struct
{
CARD8 state_flags[2]; /* Miscelaneous flags, see below #define's */
- CARD16 pad0 B16; /* Assure quadword alignment */
+ CARD16 pad0; /* Assure quadword alignment */
XETrapCfg config; /* Current Config information */
- CARD32 pad1 B32;
+ CARD32 pad1;
} XETrapGetCurRep;
/* Mask definitions for the above flags. */
@@ -309,7 +309,7 @@ typedef struct
CARD32 requests[256L]; /* Array containing request counts if trapped */
CARD32 events[XETrapCoreEvents]; /* Array containing event stats */
#ifndef VECTORED_EVENTS
- CARD32 pad B32; /* Pad out to a quadword */
+ CARD32 pad; /* Pad out to a quadword */
#endif
} XETrapGetStatsRep;
@@ -352,10 +352,10 @@ typedef struct
{
XETrapRepHdr hdr;
XETrapGetVersRep data;
- CARD32 pad0 B32; /* pad out to 32 bytes */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
+ CARD32 pad0; /* pad out to 32 bytes */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
} xXTrapGetVersReply;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapGetVersReply sizeof(xXTrapGetVersReply)
@@ -368,12 +368,12 @@ typedef struct
* The following is a shadow of the XETrapGetLastInpTimeRep
* structure. This is done to avoid structure padding.
*/
- CARD32 data_last_time B32; /* Timestamp of last input time */
- CARD32 pad0 B32; /* pad out to 32 bytes */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
+ CARD32 data_last_time; /* Timestamp of last input time */
+ CARD32 pad0; /* pad out to 32 bytes */
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
} xXTrapGetLITimReply;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapGetLITimReply sizeof(xXTrapGetLITimReply)
@@ -388,13 +388,13 @@ typedef struct
* Since the XETrapGetCurRep structure contains a sub-structure
* (XETrapCfg) there is a shadow for that as well.*/
CARD8 data_state_flags[2]; /* Misc flags, see below #define's */
- CARD16 data_pad0 B16; /* Assure quadword alignment */
+ CARD16 data_pad0; /* Assure quadword alignment */
/* XETrapCfg Shadow Starts */
CARD8 data_config_flags_valid[4L];
CARD8 data_config_flags_data[4L];
ReqFlags data_config_flags_req;
EventFlags data_config_flags_event;
- CARD16 data_config_max_pkt_size B16; /* Max num of bytes in a pkt */
+ CARD16 data_config_max_pkt_size; /* Max num of bytes in a pkt */
CARD8 data_config_cmd_key; /* Keyboard cmd_key (KeyCode) */
/*
* cmd_key is intentionally *not* defined KeyCode since it's definition is
@@ -402,7 +402,7 @@ typedef struct
*/
CARD8 data_config_pad[1L]; /* pad out to a quadword */
/* End Shadow (XETrapCfg) */
- CARD32 pad1 B32;
+ CARD32 pad1;
} xXTrapGetCurReply;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapGetCurReply sizeof(xXTrapGetCurReply)
@@ -418,27 +418,27 @@ typedef struct
{
CARD8 type;
CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
XETrapGetStatsRep data;
} xXTrapGetStatsReply;
#define sz_xXTrapGetStatsReply 1088
typedef struct /* the XTrap Output header (for output from ext to client) */
{ /* this must be quadword aligned for portability */
- CARD32 count B32; /* Length including this header */
- CARD32 timestamp B32; /* timestamp if desired */
+ CARD32 count; /* Length including this header */
+ CARD32 timestamp; /* timestamp if desired */
CARD8 type; /* event id, request id, special id */
CARD8 screen; /* screen number (0 to n) */
- INT16 win_x B16; /* X coord of drawable, if any */
- INT16 win_y B16; /* X coord of drawable, if any */
- CARD16 client B16; /* to distinguish requests */
+ INT16 win_x; /* X coord of drawable, if any */
+ INT16 win_y; /* X coord of drawable, if any */
+ CARD16 client; /* to distinguish requests */
} XETrapHeader;
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_XETrapHeader sizeof(XETrapHeader)
@@ -480,8 +480,8 @@ typedef struct
typedef struct {
CARD8 type;
CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 idx B32;
+ CARD16 sequenceNumber;
+ CARD32 idx;
CARD8 data[sz_EventData];
} xETrapDataEvent;
diff --git a/include/X11/extensions/xtraplib.h b/include/X11/extensions/xtraplib.h
index 68c5892..2694ae2 100644
--- a/include/X11/extensions/xtraplib.h
+++ b/include/X11/extensions/xtraplib.h
@@ -70,7 +70,7 @@ typedef struct
XETrapCfg v; /* XTrap configuration values */
XETrapCB *req_cb; /* Pointer to Request Callbacks */
XETrapCB *evt_cb; /* Pointer to Event Callbacks (starting at 2) */
- CARD32 last_time B32; /* Last (delta) timestamp */
+ CARD32 last_time; /* Last (delta) timestamp */
} XETCValues;
/* bits 0 thru 6 are formerly "families" (now obsolete) */
diff --git a/include/X11/fonts/FSproto.h b/include/X11/fonts/FSproto.h
index 1144285..3cdb834 100644
--- a/include/X11/fonts/FSproto.h
+++ b/include/X11/fonts/FSproto.h
@@ -135,12 +135,12 @@ typedef CARD32 fsBitmapFormatMask;
#define sz_fsBitmapFormat 4
typedef struct {
- INT16 left B16,
- right B16;
- INT16 width B16;
- INT16 ascent B16,
- descent B16;
- CARD16 attributes B16;
+ INT16 left,
+ right;
+ INT16 width;
+ INT16 ascent,
+ descent;
+ CARD16 attributes;
} fsXCharInfo;
typedef struct {
@@ -161,8 +161,8 @@ typedef struct {
} fsRange;
typedef struct {
- CARD32 position B32;
- CARD32 length B32;
+ CARD32 position;
+ CARD32 length;
} fsOffset32;
typedef struct {
@@ -170,25 +170,25 @@ typedef struct {
fsOffset32 value;
CARD8 type;
BYTE pad0;
- CARD16 pad1 B16;
+ CARD16 pad1;
} fsPropOffset;
typedef struct {
- CARD32 num_offsets B32;
- CARD32 data_len B32;
+ CARD32 num_offsets;
+ CARD32 data_len;
/* offsets */
/* data */
} fsPropInfo;
typedef struct {
- CARD16 x_resolution B16;
- CARD16 y_resolution B16;
- CARD16 point_size B16;
+ CARD16 x_resolution;
+ CARD16 y_resolution;
+ CARD16 point_size;
} fsResolution;
typedef struct {
- CARD32 flags B32;
+ CARD32 flags;
CARD8 char_range_min_char_high;
CARD8 char_range_min_char_low;
CARD8 char_range_max_char_high;
@@ -198,23 +198,23 @@ typedef struct {
CARD8 pad;
CARD8 default_char_high;
CARD8 default_char_low;
- INT16 min_bounds_left B16;
- INT16 min_bounds_right B16;
-
- INT16 min_bounds_width B16;
- INT16 min_bounds_ascent B16;
- INT16 min_bounds_descent B16;
- CARD16 min_bounds_attributes B16;
-
- INT16 max_bounds_left B16;
- INT16 max_bounds_right B16;
- INT16 max_bounds_width B16;
- INT16 max_bounds_ascent B16;
-
- INT16 max_bounds_descent B16;
- CARD16 max_bounds_attributes B16;
- INT16 font_ascent B16;
- INT16 font_descent B16;
+ INT16 min_bounds_left;
+ INT16 min_bounds_right;
+
+ INT16 min_bounds_width;
+ INT16 min_bounds_ascent;
+ INT16 min_bounds_descent;
+ CARD16 min_bounds_attributes;
+
+ INT16 max_bounds_left;
+ INT16 max_bounds_right;
+ INT16 max_bounds_width;
+ INT16 max_bounds_ascent;
+
+ INT16 max_bounds_descent;
+ CARD16 max_bounds_attributes;
+ INT16 font_ascent;
+ INT16 font_descent;
/* propinfo */
} fsXFontInfoHeader;
@@ -224,43 +224,43 @@ typedef struct {
typedef struct {
BYTE byteOrder;
CARD8 num_auths;
- CARD16 major_version B16;
- CARD16 minor_version B16;
- CARD16 auth_len B16;
+ CARD16 major_version;
+ CARD16 minor_version;
+ CARD16 auth_len;
/* auth data */
} fsConnClientPrefix;
typedef struct {
- CARD16 status B16;
- CARD16 major_version B16;
- CARD16 minor_version B16;
+ CARD16 status;
+ CARD16 major_version;
+ CARD16 minor_version;
CARD8 num_alternates;
CARD8 auth_index;
- CARD16 alternate_len B16;
- CARD16 auth_len B16;
+ CARD16 alternate_len;
+ CARD16 auth_len;
/* alternates */
/* auth data */
} fsConnSetup;
typedef struct {
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
+ CARD32 length;
+ CARD16 status;
+ CARD16 pad;
/* more auth data */
} fsConnSetupExtra;
typedef struct {
- CARD32 length B32;
- CARD16 max_request_len B16;
- CARD16 vendor_len B16;
- CARD32 release_number B32;
+ CARD32 length;
+ CARD16 max_request_len;
+ CARD16 vendor_len;
+ CARD32 release_number;
/* vendor string */
} fsConnSetupAccept;
typedef struct {
CARD8 reqType;
CARD8 data;
- CARD16 length B16;
+ CARD16 length;
} fsReq;
/*
@@ -273,15 +273,15 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 data;
- CARD16 length B16;
- CARD32 pad B32; /* to fill out to multiple of 64 bits */
+ CARD16 length;
+ CARD32 pad; /* to fill out to multiple of 64 bits */
} fsFakeReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Font id B32;
+ CARD16 length;
+ Font id;
} fsResourceReq;
typedef fsReq fsNoopReq;
@@ -290,24 +290,24 @@ typedef fsReq fsListExtensionsReq;
typedef struct {
CARD8 reqType;
BYTE nbytes;
- CARD16 length B16;
+ CARD16 length;
/* name */
} fsQueryExtensionReq;
typedef struct {
CARD8 reqType;
CARD8 data;
- CARD16 length B16;
- CARD32 maxNames B32;
- CARD16 nbytes B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ CARD32 maxNames;
+ CARD16 nbytes;
+ CARD16 pad2;
/* pattern */
} fsListCataloguesReq;
typedef struct {
CARD8 reqType;
BYTE num_catalogues;
- CARD16 length B16;
+ CARD16 length;
/* catalogues */
} fsSetCataloguesReq;
@@ -316,21 +316,21 @@ typedef fsReq fsGetCataloguesReq;
typedef struct {
CARD8 reqType;
CARD8 ext_opcode;
- CARD16 length B16;
+ CARD16 length;
Mask event_mask;
} fsSetEventMaskReq;
typedef struct {
CARD8 reqType;
CARD8 ext_opcode;
- CARD16 length B16;
+ CARD16 length;
} fsGetEventMaskReq;
typedef struct {
CARD8 reqType;
BYTE num_auths;
- CARD16 length B16;
- AccContext acid B32;
+ CARD16 length;
+ AccContext acid;
/* auth protocols */
} fsCreateACReq;
@@ -340,7 +340,7 @@ typedef fsResourceReq fsSetAuthorizationReq;
typedef struct {
CARD8 reqType;
BYTE num_resolutions;
- CARD16 length B16;
+ CARD16 length;
/* resolutions */
} fsSetResolutionReq;
@@ -349,10 +349,10 @@ typedef fsReq fsGetResolutionReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- CARD32 maxNames B32;
- CARD16 nbytes B16;
- CARD16 pad2 B16;
+ CARD16 length;
+ CARD32 maxNames;
+ CARD16 nbytes;
+ CARD16 pad2;
/* pattern */
} fsListFontsReq;
@@ -361,10 +361,10 @@ typedef fsListFontsReq fsListFontsWithXInfoReq;
typedef struct {
CARD8 reqType;
BYTE pad;
- CARD16 length B16;
- Font fid B32;
- fsBitmapFormatMask format_mask B32;
- fsBitmapFormat format_hint B32;
+ CARD16 length;
+ Font fid;
+ fsBitmapFormatMask format_mask;
+ fsBitmapFormat format_hint;
/* pattern */
} fsOpenBitmapFontReq;
@@ -373,9 +373,9 @@ typedef fsResourceReq fsQueryXInfoReq;
typedef struct {
CARD8 reqType;
BOOL range;
- CARD16 length B16;
- Font fid B32;
- CARD32 num_ranges B32;
+ CARD16 length;
+ Font fid;
+ CARD32 num_ranges;
/* list of chars */
} fsQueryXExtents8Req;
@@ -384,10 +384,10 @@ typedef fsQueryXExtents8Req fsQueryXExtents16Req;
typedef struct {
CARD8 reqType;
BOOL range;
- CARD16 length B16;
- Font fid B32;
- fsBitmapFormat format B32;
- CARD32 num_ranges B32;
+ CARD16 length;
+ Font fid;
+ fsBitmapFormat format;
+ CARD32 num_ranges;
/* list of chars */
} fsQueryXBitmaps8Req;
@@ -400,92 +400,92 @@ typedef fsResourceReq fsCloseReq;
typedef struct {
BYTE type;
BYTE data1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
} fsGenericReply;
typedef struct {
BYTE type;
CARD8 nExtensions;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
/* extension names */
} fsListExtensionsReply;
typedef struct {
BYTE type;
CARD8 present;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 major_version B16;
- CARD16 minor_version B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 major_version;
+ CARD16 minor_version;
CARD8 major_opcode;
CARD8 first_event;
CARD8 num_events;
CARD8 first_error;
CARD8 num_errors;
CARD8 pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} fsQueryExtensionReply;
typedef struct {
BYTE type;
BYTE pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_replies B32;
- CARD32 num_catalogues B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_replies;
+ CARD32 num_catalogues;
/* catalog names */
} fsListCataloguesReply;
typedef struct {
BYTE type;
CARD8 num_catalogues;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
/* catalogue names */
} fsGetCataloguesReply;
typedef struct {
BYTE type;
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 event_mask B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 event_mask;
} fsGetEventMaskReply;
typedef struct {
BYTE type;
CARD8 auth_index;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 status;
+ CARD16 pad;
/* auth data */
} fsCreateACReply;
typedef struct {
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
+ CARD32 length;
+ CARD16 status;
+ CARD16 pad;
/* auth data */
} fsCreateACExtraReply;
typedef struct {
BYTE type;
CARD8 num_resolutions;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
/* resolutions */
} fsGetResolutionReply;
typedef struct {
BYTE type;
BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 following B32;
- CARD32 nFonts B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 following;
+ CARD32 nFonts;
/* font names */
} fsListFontsReply;
@@ -499,10 +499,10 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 nameLength; /* 0 is end-of-reply */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 nReplies B32;
- CARD32 font_header_flags B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 nReplies;
+ CARD32 font_header_flags;
CARD8 font_hdr_char_range_min_char_high;
CARD8 font_hdr_char_range_min_char_low;
CARD8 font_hdr_char_range_max_char_high;
@@ -511,20 +511,20 @@ typedef struct {
CARD8 font_header_pad;
CARD8 font_header_default_char_high;
CARD8 font_header_default_char_low;
- INT16 font_header_min_bounds_left B16;
- INT16 font_header_min_bounds_right B16;
- INT16 font_header_min_bounds_width B16;
- INT16 font_header_min_bounds_ascent B16;
- INT16 font_header_min_bounds_descent B16;
- CARD16 font_header_min_bounds_attributes B16;
- INT16 font_header_max_bounds_left B16;
- INT16 font_header_max_bounds_right B16;
- INT16 font_header_max_bounds_width B16;
- INT16 font_header_max_bounds_ascent B16;
- INT16 font_header_max_bounds_descent B16;
- CARD16 font_header_max_bounds_attributes B16;
- INT16 font_header_font_ascent B16;
- INT16 font_header_font_descent B16;
+ INT16 font_header_min_bounds_left;
+ INT16 font_header_min_bounds_right;
+ INT16 font_header_min_bounds_width;
+ INT16 font_header_min_bounds_ascent;
+ INT16 font_header_min_bounds_descent;
+ CARD16 font_header_min_bounds_attributes;
+ INT16 font_header_max_bounds_left;
+ INT16 font_header_max_bounds_right;
+ INT16 font_header_max_bounds_width;
+ INT16 font_header_max_bounds_ascent;
+ INT16 font_header_max_bounds_descent;
+ CARD16 font_header_max_bounds_attributes;
+ INT16 font_header_font_ascent;
+ INT16 font_header_font_descent;
/* propinfo */
/* name */
} fsListFontsWithXInfoReply;
@@ -532,20 +532,20 @@ typedef struct {
typedef struct {
BYTE type;
CARD8 otherid_valid;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 otherid B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 otherid;
BYTE cachable;
BYTE pad1;
- CARD16 pad2 B16;
+ CARD16 pad2;
} fsOpenBitmapFontReply;
typedef struct {
BYTE type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 font_header_flags B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 font_header_flags;
CARD8 font_hdr_char_range_min_char_high;
CARD8 font_hdr_char_range_min_char_low;
CARD8 font_hdr_char_range_max_char_high;
@@ -554,29 +554,29 @@ typedef struct {
CARD8 font_header_pad;
CARD8 font_header_default_char_high;
CARD8 font_header_default_char_low;
- INT16 font_header_min_bounds_left B16;
- INT16 font_header_min_bounds_right B16;
- INT16 font_header_min_bounds_width B16;
- INT16 font_header_min_bounds_ascent B16;
- INT16 font_header_min_bounds_descent B16;
- CARD16 font_header_min_bounds_attributes B16;
- INT16 font_header_max_bounds_left B16;
- INT16 font_header_max_bounds_right B16;
- INT16 font_header_max_bounds_width B16;
- INT16 font_header_max_bounds_ascent B16;
- INT16 font_header_max_bounds_descent B16;
- CARD16 font_header_max_bounds_attributes B16;
- INT16 font_header_font_ascent B16;
- INT16 font_header_font_descent B16;
+ INT16 font_header_min_bounds_left;
+ INT16 font_header_min_bounds_right;
+ INT16 font_header_min_bounds_width;
+ INT16 font_header_min_bounds_ascent;
+ INT16 font_header_min_bounds_descent;
+ CARD16 font_header_min_bounds_attributes;
+ INT16 font_header_max_bounds_left;
+ INT16 font_header_max_bounds_right;
+ INT16 font_header_max_bounds_width;
+ INT16 font_header_max_bounds_ascent;
+ INT16 font_header_max_bounds_descent;
+ CARD16 font_header_max_bounds_attributes;
+ INT16 font_header_font_ascent;
+ INT16 font_header_font_descent;
/* propinfo */
} fsQueryXInfoReply;
typedef struct {
BYTE type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_extents B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 num_extents;
/* extents */
} fsQueryXExtents8Reply;
@@ -585,11 +585,11 @@ typedef fsQueryXExtents8Reply fsQueryXExtents16Reply;
typedef struct {
BYTE type;
CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 replies_hint B32;
- CARD32 num_chars B32;
- CARD32 nbytes B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 replies_hint;
+ CARD32 num_chars;
+ CARD32 nbytes;
/* offsets */
/* glyphs */
} fsQueryXBitmaps8Reply;
@@ -606,113 +606,113 @@ typedef union {
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
} fsError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
} fsRequestError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
- fsBitmapFormat format B32;
+ CARD16 pad;
+ fsBitmapFormat format;
} fsFormatError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
Font fontid;
} fsFontError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
fsRange range;
} fsRangeError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
Mask event_mask;
} fsEventMaskError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
AccContext acid;
} fsAccessContextError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
Font fontid;
} fsIDChoiceError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
} fsNameError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
@@ -722,55 +722,55 @@ typedef struct {
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
} fsAllocError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
- CARD32 bad_length B32;
+ CARD16 pad;
+ CARD32 bad_length;
} fsLengthError;
typedef struct {
BYTE type;
BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
CARD8 major_opcode;
CARD8 minor_opcode;
- CARD16 pad B16;
+ CARD16 pad;
} fsImplementationError;
/* events */
typedef struct {
BYTE type;
BYTE event_code;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
} fsKeepAliveEvent;
typedef struct {
BYTE type;
BYTE event_code;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
fsTimestamp timestamp;
BOOL added;
BOOL deleted;
- CARD16 pad B16;
+ CARD16 pad;
} fsCatalogueChangeNotifyEvent;
typedef fsCatalogueChangeNotifyEvent fsFontChangeNotifyEvent;
--
2.15.2
More information about the xorg-devel
mailing list