diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:09:23 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:09:23 +0200 |
| commit | 4a9c1b9465f189a1477b1ecce7cdfacfd266cd65 (patch) | |
| tree | 4688606f66a7e3a79944bd23299dddda06c2a219 /nx-X11/include/extensions | |
| parent | aba2a534f630f5b65a53e0ea7cdba17b77263f87 (diff) | |
| parent | cad9f4ef87ddf4e2865783ce7ea7e772d7b196b7 (diff) | |
| download | nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.tar.gz nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.tar.bz2 nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.zip | |
Merge branch 'Ionic-feature/composite-update' into 3.6.x
Diffstat (limited to 'nx-X11/include/extensions')
| -rw-r--r-- | nx-X11/include/extensions/composite.h | 8 | ||||
| -rw-r--r-- | nx-X11/include/extensions/compositeproto.h | 37 |
2 files changed, 43 insertions, 2 deletions
diff --git a/nx-X11/include/extensions/composite.h b/nx-X11/include/extensions/composite.h index d1901750a..fd6375199 100644 --- a/nx-X11/include/extensions/composite.h +++ b/nx-X11/include/extensions/composite.h @@ -29,7 +29,7 @@ #define COMPOSITE_NAME "Composite" #define COMPOSITE_MAJOR 0 -#define COMPOSITE_MINOR 2 +#define COMPOSITE_MINOR 4 #define CompositeRedirectAutomatic 0 #define CompositeRedirectManual 1 @@ -41,7 +41,11 @@ #define X_CompositeUnredirectSubwindows 4 #define X_CompositeCreateRegionFromBorderClip 5 #define X_CompositeNameWindowPixmap 6 +#define X_CompositeGetOverlayWindow 7 +#define X_CompositeReleaseOverlayWindow 8 -#define CompositeNumberRequests (X_CompositeNameWindowPixmap + 1) +#define CompositeNumberRequests (X_CompositeReleaseOverlayWindow + 1) + +#define CompositeNumberEvents 0 #endif /* _COMPOSITE_H_ */ diff --git a/nx-X11/include/extensions/compositeproto.h b/nx-X11/include/extensions/compositeproto.h index a851c727e..51103f389 100644 --- a/nx-X11/include/extensions/compositeproto.h +++ b/nx-X11/include/extensions/compositeproto.h @@ -30,6 +30,7 @@ #define Window CARD32 #define Region CARD32 +#define Pixmap CARD32 /* * requests and replies @@ -129,7 +130,43 @@ typedef struct { #define sz_xCompositeNameWindowPixmapReq 12 +/* Version 0.3 additions */ + +typedef struct { + CARD8 reqType; + CARD8 compositeReqType; + CARD16 length B16; + Window window B32; +} xCompositeGetOverlayWindowReq; + +#define sz_xCompositeGetOverlayWindowReq sizeof(xCompositeGetOverlayWindowReq) + +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; +} xCompositeGetOverlayWindowReply; + +#define sz_xCompositeGetOverlayWindowReply sizeof(xCompositeGetOverlayWindowReply) + +typedef struct { + CARD8 reqType; + CARD8 compositeReqType; + CARD16 length B16; + Window window B32; +} xCompositeReleaseOverlayWindowReq; + +#define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq) + #undef Window #undef Region +#undef Pixmap #endif /* _COMPOSITEPROTO_H_ */ |