XExtensions ChangeLog, 1.7, 1.8 XvMC.h, 1.8, 1.9 XvMCproto.h, 1.5,
1.6 dpms.h, 3.5, 3.6
Daniel Stone
xlibs-commit@pdx.freedesktop.org
Fri Jan 28 12:05:37 PST 2005
- Previous message: ScrnSaverExt ChangeLog,1.1,1.2 scrnsaver.h,1.2,1.3
- Next message: Xproto ChangeLog, 3.10, 3.11 Xmd.h, 3.18, 3.19 Xos_r.h, 1.19,
1.20 Xpoll.h, 3.9, 3.10 Xthreads.h, 3.11, 3.12 keysymdef.h,
1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: daniels
Update of /cvs/xlibs/XExtensions
In directory gabe:/tmp/cvs-serv8305
Modified Files:
ChangeLog XvMC.h XvMCproto.h dpms.h
Log Message:
Sync from X.Org HEAD; add guarding to dpms.h, new XvMC proto support.
Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/XExtensions/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog 12 Apr 2004 13:45:15 -0000 1.7
+++ ChangeLog 28 Jan 2005 20:05:35 -0000 1.8
@@ -1,3 +1,12 @@
+2005-01-29 Daniel Stone <daniel@freedesktop.org>
+
+ * XvMC.h:
+ * XvMCproto.h:
+ Add in GetDRInfo support (X.Org HEAD).
+
+ * dpms.h:
+ Add header guard, _XFUNCPROTO* (X.Org HEAD).
+
2004-04-12 Daniel Stone <daniel@freedesktop.org>
* Tag release 1.0.2 for xlibs 1.0.1.
Index: XvMC.h
===================================================================
RCS file: /cvs/xlibs/XExtensions/XvMC.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- XvMC.h 16 Jan 2002 01:15:45 -0000 1.8
+++ XvMC.h 28 Jan 2005 20:05:35 -0000 1.9
@@ -10,7 +10,7 @@
#define XvMCNumEvents 0
#define XvMCNumErrors 3
#define XvMCVersion 1
-#define XvMCRevision 0
+#define XvMCRevision 1
#define XvMCBadContext 0
#define XvMCBadSurface 1
Index: XvMCproto.h
===================================================================
RCS file: /cvs/xlibs/XExtensions/XvMCproto.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- XvMCproto.h 14 Nov 2001 21:54:37 -0000 1.5
+++ XvMCproto.h 28 Jan 2005 20:05:35 -0000 1.6
@@ -12,7 +12,8 @@
#define xvmc_CreateSubpicture 6
#define xvmc_DestroySubpicture 7
#define xvmc_ListSubpictureTypes 8
-#define xvmc_LastRequest xvmc_ListSubpictureTypes
+#define xvmc_GetDRInfo 9
+#define xvmc_LastRequest xvmc_GetDRInfo
#define xvmcNumRequest (xvmc_LastRequest + 1)
@@ -200,4 +201,28 @@
} xvmcListSubpictureTypesReply;
#define sz_xvmcListSubpictureTypesReply 32
+typedef struct {
+ CARD8 reqType;
+ CARD8 xvmcReqType;
+ CARD16 length B16;
+ CARD32 port B32;
+ CARD32 shmKey B32;
+ CARD32 magic B32;
+} 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;
+} xvmcGetDRInfoReply;
+#define sz_xvmcGetDRInfoReply 32
+
#endif
Index: dpms.h
===================================================================
RCS file: /cvs/xlibs/XExtensions/dpms.h,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- dpms.h 17 Jan 2001 17:53:20 -0000 3.5
+++ dpms.h 28 Jan 2005 20:05:35 -0000 3.6
@@ -28,6 +28,9 @@
******************************************************************/
/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
+#ifndef _X11_EXTENSIONS_DPMS_H
+#define _X11_EXTENSIONS_DPMS_H 1
+
/*
* HISTORY
*/
@@ -46,6 +49,8 @@
#include <X11/X.h>
#include <X11/Xmd.h>
+_XFUNCPROTOBEGIN
+
extern Bool DPMSQueryExtension(Display *, int *, int *);
extern Status DPMSGetVersion(Display *, int *, int *);
extern Bool DPMSCapable(Display *);
@@ -55,6 +60,8 @@
extern Status DPMSDisable(Display *);
extern Status DPMSForceLevel(Display *, CARD16);
extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
-#endif
+_XFUNCPROTOEND
+#endif /* !DPMS_SERVER */
+#endif /* !_X11_EXTENSIONS_DPMS_H */
- Previous message: ScrnSaverExt ChangeLog,1.1,1.2 scrnsaver.h,1.2,1.3
- Next message: Xproto ChangeLog, 3.10, 3.11 Xmd.h, 3.18, 3.19 Xos_r.h, 1.19,
1.20 Xpoll.h, 3.9, 3.10 Xthreads.h, 3.11, 3.12 keysymdef.h,
1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xlibs-commit
mailing list