diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:21:08 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:21:08 +0100 |
| commit | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (patch) | |
| tree | b730b2594caa70dcbbf0a860da25d46d26f747ed /X11 | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.tar.gz vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.tar.bz2 vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.zip | |
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
xserver commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805
xextproto commit 3f355f138d6df57e067458a20f47307883048adb
fontconfig commit a4443e64c89256087d40462cfbb482950873e366
mesa commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
Diffstat (limited to 'X11')
| -rw-r--r-- | X11/extensions/shm.h | 2 | ||||
| -rw-r--r-- | X11/extensions/shmproto.h | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/X11/extensions/shm.h b/X11/extensions/shm.h index e076402a8..be49f5e97 100644 --- a/X11/extensions/shm.h +++ b/X11/extensions/shm.h @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. #define SHMNAME "MIT-SHM" #define SHM_MAJOR_VERSION 1 /* current version numbers */ -#define SHM_MINOR_VERSION 1 +#define SHM_MINOR_VERSION 2 #define ShmCompletion 0 #define ShmNumberEvents (ShmCompletion + 1) diff --git a/X11/extensions/shmproto.h b/X11/extensions/shmproto.h index e5de377b9..8136aa9f7 100644 --- a/X11/extensions/shmproto.h +++ b/X11/extensions/shmproto.h @@ -43,6 +43,8 @@ in this Software without prior written authorization from The Open Group. #define X_ShmPutImage 3 #define X_ShmGetImage 4 #define X_ShmCreatePixmap 5 +#define X_ShmAttachFd 6 +#define X_ShmCreateSegment 7 typedef struct _ShmQueryVersion { CARD8 reqType; /* always ShmReqCode */ @@ -178,6 +180,46 @@ typedef struct _ShmCompletion { } xShmCompletionEvent; #define sz_xShmCompletionEvent 32 +/* Version 1.2 additions */ +typedef struct _ShmAttachFd { + CARD8 reqType; /* always ShmReqCode */ + CARD8 shmReqType; /* always X_ShmAttachFd */ + CARD16 length B16; + ShmSeg shmseg B32; + BOOL readOnly; + BYTE pad0; + CARD16 pad1 B16; +} xShmAttachFdReq; +/* File descriptor is passed with this request */ +#define sz_xShmAttachFdReq 12 + +typedef struct _ShmCreateSegment { + CARD8 reqType; /* always ShmReqCode */ + CARD8 shmReqType; /* always X_ShmAttachFd */ + CARD16 length B16; + ShmSeg shmseg B32; + CARD32 size B32; + BOOL readOnly; + BYTE pad0; + CARD16 pad1 B16; +} 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 */ +} xShmCreateSegmentReply; +/* File descriptor is passed with this reply */ +#define sz_xShmCreateSegmentReply 32 + #undef ShmSeg #undef Drawable #undef VisualID |