summaryrefslogtreecommitdiff
path: root/xc/include
diff options
context:
space:
mode:
Diffstat (limited to 'xc/include')
-rw-r--r--xc/include/GL/Imakefile6
-rw-r--r--xc/include/Imakefile4
-rw-r--r--xc/include/Xmd.h15
-rw-r--r--xc/include/extensions/Imakefile16
-rw-r--r--xc/include/extensions/Xvproto.h3
-rw-r--r--xc/include/extensions/shape.h4
-rw-r--r--xc/include/extensions/xf86vmode.h30
-rw-r--r--xc/include/extensions/xf86vmstr.h63
8 files changed, 111 insertions, 30 deletions
diff --git a/xc/include/GL/Imakefile b/xc/include/GL/Imakefile
index fc6458972..186f2cba5 100644
--- a/xc/include/GL/Imakefile
+++ b/xc/include/GL/Imakefile
@@ -1,14 +1,11 @@
-
-XCOMM $XFree86: xc/include/GL/Imakefile,v 1.12 2001/03/22 21:48:52 dawes Exp $
+XCOMM $XFree86: xc/include/GL/Imakefile,v 1.13 2001/04/30 14:58:48 dawes Exp $
LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
LinkSourceFile(osmesa.h, ../../extras/Mesa/include/GL)
-#if BuildGLXLibrary
GLXHEADERS = gl.h glext.h glu.h glx.h glxint.h glxmd.h glxproto.h \
glxtokens.h osmesa.h
-#endif
HEADERS = $(GLXHEADERS)
@@ -19,3 +16,4 @@ InstallMultipleFlags($(HEADERS),$(INCDIR)/GL,$(INSTINCFLAGS))
InstallDriverSDKNonExecFile(glxint.h,$(DRIVERSDKINCLUDEDIR)/GL)
InstallDriverSDKNonExecFile(glxtokens.h,$(DRIVERSDKINCLUDEDIR)/GL)
+
diff --git a/xc/include/Imakefile b/xc/include/Imakefile
index af2d84d88..89c6ed9a0 100644
--- a/xc/include/Imakefile
+++ b/xc/include/Imakefile
@@ -3,11 +3,11 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
-XCOMM $XFree86: xc/include/Imakefile,v 3.27 2001/01/21 21:19:08 tsi Exp $
+XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags /**/
-#if BuildGLXLibrary
+#if BuildGlxExt || BuildGLXLibrary
GLXDIR = GL
#endif
diff --git a/xc/include/Xmd.h b/xc/include/Xmd.h
index c464ddc63..39d647814 100644
--- a/xc/include/Xmd.h
+++ b/xc/include/Xmd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/Xmd.h,v 3.9 2001/01/17 17:53:11 dawes Exp $ */
+/* $XFree86: xc/include/Xmd.h,v 3.9.2.1 2001/05/30 14:29:30 alanh Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -146,26 +146,17 @@ typedef unsigned char CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
-#ifndef __CYGWIN__
#ifndef __EMX__
typedef CARD8 BYTE;
typedef CARD8 BOOL;
-#else
+#else /* __EMX__ */
/*
* This is bad style, but the central include file <os2.h> declares them
* as well
*/
#define BYTE CARD8
#define BOOL CARD8
-#endif
-#endif
-
-#ifdef __CYGWIN__
-#undef BYTE
-#undef BOOL
-#define BYTE CARD8
-#define BOOL CARD8
-#endif
+#endif /* __EMX__ */
/*
* definitions for sign-extending bitfields on 64-bit architectures
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index b99dc739b..51e20dcee 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -3,38 +3,38 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.40 2001/04/23 16:17:06 tsi Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.41 2001/04/28 23:52:32 dawes Exp $
-#if BuildScreenSaverExt
+#if BuildScreenSaverExt || BuildScreenSaveLibrary
SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
#endif
-#if BuildXF86MiscExt
+#if BuildXF86MiscExt || BuildXF86MiscLibrary
XF86MISCHEADERS = xf86misc.h xf86mscstr.h
#endif
#if BuildXF86BigfontExt
XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h
#endif
-#if BuildXF86VidModeExt
+#if BuildXF86VidModeExt || BuildXF86VidModeLibrary
XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
#endif
-#if BuildXF86DGA
+#if BuildXF86DGA || BuildXF86DGALibrary
XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
#endif
#if BuildLBX
LBXHEADERS = lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h
#endif
-#if BuildXvExt
+#if BuildXvExt || BuildXvLibrary
XVHEADERS = Xv.h Xvlib.h Xvproto.h
XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h
#endif
-#if BuildXF86RushExt
+#if BuildXF86RushExt || BuildXF86RushLibrary
XF86RUSHHEADERS = xf86rush.h xf86rushstr.h
#endif
#if BuildFontCache
FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h
#endif
-#if BuildXinerama
+#if BuildXinerama || BuildXineramaLibrary
XINERAMAHEADERS = panoramiXext.h panoramiXproto.h Xinerama.h
#endif
#if BuildRender || BuildXftLibrary
diff --git a/xc/include/extensions/Xvproto.h b/xc/include/extensions/Xvproto.h
index 0b44154d8..b4d8f22cd 100644
--- a/xc/include/extensions/Xvproto.h
+++ b/xc/include/extensions/Xvproto.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/Xvproto.h,v 1.6 2001/05/07 21:37:12 tsi Exp $ */
#ifndef XVPROTO_H
#define XVPROTO_H
@@ -49,6 +49,7 @@ SOFTWARE.
**
*/
+#include <X11/Xmd.h>
/* Symbols: These are undefined at the end of this file to restore the
values they have in Xv.h */
diff --git a/xc/include/extensions/shape.h b/xc/include/extensions/shape.h
index 699712a57..6c01d4cb6 100644
--- a/xc/include/extensions/shape.h
+++ b/xc/include/extensions/shape.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/include/extensions/shape.h,v 1.1.1.3.2.1 2001/05/25 18:50:07 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -52,6 +53,9 @@ in this Software without prior written authorization from The Open Group.
#define ShapeNumberEvents (ShapeNotify + 1)
#ifndef _SHAPE_SERVER_
+
+#include <X11/Xutil.h>
+
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
diff --git a/xc/include/extensions/xf86vmode.h b/xc/include/extensions/xf86vmode.h
index adc0b319a..facb1abc3 100644
--- a/xc/include/extensions/xf86vmode.h
+++ b/xc/include/extensions/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.28 2001/01/17 17:53:23 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
/*
Copyright 1995 Kaleb S. KEITHLEY
@@ -56,6 +56,9 @@ from Kaleb S. KEITHLEY
#define X_XF86VidModeSetClientVersion 14
#define X_XF86VidModeSetGamma 15
#define X_XF86VidModeGetGamma 16
+#define X_XF86VidModeGetGammaRamp 17
+#define X_XF86VidModeSetGammaRamp 18
+#define X_XF86VidModeGetGammaRampSize 19
#define CLKFLAG_PROGRAMABLE 1
@@ -278,6 +281,31 @@ Bool XF86VidModeSetGamma(
XF86VidModeGamma* /* Gamma */
);
+Bool XF86VidModeSetGammaRamp(
+ Display* /* dpy */,
+ int /* screen */,
+ int /* size */,
+ unsigned short* /* red array */,
+ unsigned short* /* green array */,
+ unsigned short* /* blue array */
+);
+
+Bool XF86VidModeGetGammaRamp(
+ Display* /* dpy */,
+ int /* screen */,
+ int /* size */,
+ unsigned short* /* red array */,
+ unsigned short* /* green array */,
+ unsigned short* /* blue array */
+);
+
+Bool XF86VidModeGetGammaRampSize(
+ Display* /* dpy */,
+ int /* screen */,
+ int* /* size */
+);
+
+
_XFUNCPROTOEND
#endif
diff --git a/xc/include/extensions/xf86vmstr.h b/xc/include/extensions/xf86vmstr.h
index 462c441fa..df9e31563 100644
--- a/xc/include/extensions/xf86vmstr.h
+++ b/xc/include/extensions/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.24 2001/01/17 17:53:23 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.26 2001/05/06 21:59:47 mvojkovi Exp $ */
/*
Copyright 1995 Kaleb S. KEITHLEY
@@ -40,7 +40,7 @@ from Kaleb S. KEITHLEY
#define XF86VIDMODENAME "XFree86-VidModeExtension"
#define XF86VIDMODE_MAJOR_VERSION 2 /* current version numbers */
-#define XF86VIDMODE_MINOR_VERSION 0
+#define XF86VIDMODE_MINOR_VERSION 1
/*
* major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
* major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
@@ -483,5 +483,64 @@ typedef struct _XF86VidModeSetGamma {
} xXF86VidModeSetGammaReq;
#define sz_xXF86VidModeSetGammaReq 32
+
+typedef struct _XF86VidModeSetGammaRamp {
+ CARD8 reqType; /* always XF86VidModeReqCode */
+ CARD8 xf86vidmodeReqType;
+ CARD16 length B16;
+ CARD16 screen B16;
+ CARD16 size B16;
+} xXF86VidModeSetGammaRampReq;
+#define sz_xXF86VidModeSetGammaRampReq 8
+
+typedef struct _XF86VidModeGetGammaRamp {
+ CARD8 reqType; /* always XF86VidModeReqCode */
+ CARD8 xf86vidmodeReqType;
+ CARD16 length B16;
+ CARD16 screen B16;
+ CARD16 size B16;
+} 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;
+} xXF86VidModeGetGammaRampReply;
+#define sz_xXF86VidModeGetGammaRampReply 32
+
+typedef struct _XF86VidModeGetGammaRampSize {
+ CARD8 reqType; /* always XF86VidModeReqCode */
+ CARD8 xf86vidmodeReqType;
+ CARD16 length B16;
+ CARD16 screen B16;
+ CARD16 pad B16;
+} 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;
+} xXF86VidModeGetGammaRampSizeReply;
+#define sz_xXF86VidModeGetGammaRampSizeReply 32
+
+
#endif /* _XF86VIDMODESTR_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 20:55:19 +0000