Commit 2ff36509 authored by alanh's avatar alanh
Browse files

Import of XFree86 4.2.99.2

parent dde55207
......@@ -35,7 +35,7 @@
*
* Author: Adobe Systems Incorporated
*/
/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.5 2001/11/01 23:35:26 dawes Exp $ */
/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.6 2002/04/04 14:05:35 eich Exp $ */
#ifndef DPSCONFIG_H
#define DPSCONFIG_H
......@@ -88,9 +88,10 @@
#if defined(__alpha) || defined(__alpha__) || \
defined(__ia64__) || defined(ia64) || \
defined(__s390x__)
defined(__s390x__) || \
defined(__x86_64__) || defined(x86_64)
#define IEEEFLOAT 1
#endif /* __alpha */
#endif
#ifdef __i386__
#define IEEEFLOAT 1
......
......@@ -35,7 +35,7 @@
*
* Author: Adobe Systems Incorporated
*/
/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.4 2001/08/01 00:44:34 tsi Exp $ */
/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.5 2002/08/20 09:48:18 herrb Exp $ */
#ifndef DPSFRIENDS_H
#define DPSFRIENDS_H
......@@ -392,7 +392,7 @@ typedef struct {
#ifndef NeXTSTEP
#define DPSSYNCHOOK(ctxt) \
if ((ctxt)->contextFlags && DPS_FLAG_SYNC) DPSWaitContext(ctxt);
if ((ctxt)->contextFlags & DPS_FLAG_SYNC) DPSWaitContext(ctxt);
#endif /* NeXT */
/*=== PROCEDURES ===*/
......
XCOMM $XFree86: xc/include/GL/Imakefile,v 1.13 2001/04/30 14:58:48 dawes Exp $
XCOMM $XFree86: xc/include/GL/Imakefile,v 1.14 2002/02/22 21:32:50 dawes Exp $
LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
LinkSourceFile(glxext.h, ../../extras/Mesa/include/GL)
LinkSourceFile(osmesa.h, ../../extras/Mesa/include/GL)
GLXHEADERS = gl.h glext.h glu.h glx.h glxint.h glxmd.h glxproto.h \
glxtokens.h osmesa.h
glxtokens.h osmesa.h glxext.h
HEADERS = $(GLXHEADERS)
......
#ifndef __GLX_glx_h__
#define __GLX_glx_h__
/* $XFree86: xc/include/GL/glx.h,v 1.8 2001/03/21 15:51:38 dawes Exp $ */
/* $XFree86: xc/include/GL/glx.h,v 1.9 2002/02/22 21:32:50 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
......@@ -108,15 +108,30 @@ extern int glXQueryContext (Display *dpy, GLXContext ctx, int attribute, int *va
extern void glXSelectEvent (Display *dpy, GLXDrawable draw, unsigned long event_mask);
extern void glXGetSelectedEvent (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
/*** SGI GLX extensions */
/* GLX 1.4 and later */
extern void (*glXGetProcAddress(const GLubyte *procname))();
#ifndef GLX_GLXEXT_LEGACY
#include <GL/glxext.h>
#else
/* GLX extensions */
#define GLX_EXT_import_context 1
#define GLX_EXT_visual_info 1
#define GLX_EXT_visual_rating 1
#define GLX_ARB_get_proc_address 1
extern GLXContextID glXGetContextIDEXT (const GLXContext ctx);
extern GLXDrawable glXGetCurrentDrawableEXT (void);
extern GLXContext glXImportContextEXT (Display *dpy, GLXContextID contextID);
extern void glXFreeContextEXT (Display *dpy, GLXContext ctx);
extern int glXQueryContextInfoEXT (Display *dpy, GLXContext ctx, int attribute, int *value);
extern Display * glXGetCurrentDisplayEXT (void);
extern void (*glXGetProcAddressARB(const GLubyte *procName))( void );
#endif /* GLX_GLXEXT_LEGACY */
/*** Should these go here, or in another header? */
/*
** GLX Events
......
#ifndef __GLX_glxtokens_h__
#define __GLX_glxtokens_h__
/* $XFree86: xc/include/GL/glxtokens.h,v 1.5 2001/03/21 15:51:38 dawes Exp $ */
/* $XFree86: xc/include/GL/glxtokens.h,v 1.6 2002/02/22 21:32:50 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
......@@ -43,6 +43,7 @@ extern "C" {
#define GLX_VERSION_1_1 1
#define GLX_VERSION_1_2 1
#define GLX_VERSION_1_3 1
#define GLX_VERSION_1_4 1
/*
** Visual Config Attributes (glXGetConfig, glXGetFBConfigAttrib)
......@@ -217,11 +218,11 @@ extern "C" {
#define GLX_VISUAL_ID_EXT 0x800B /* id of context's visual */
#define GLX_SCREEN_EXT 0x800C /* screen number */
/* GLX Extension Strings */
#define GLX_EXT_import_context 1
#define GLX_EXT_visual_info 1
#define GLX_EXT_visual_rating 1
#define GLX_ARB_get_proc_address 1
/*
* GLX 1.4 and later:
*/
#define GLX_SAMPLE_BUFFERS_SGIS 100000
#define GLX_SAMPLES_SGIS 100001
#ifdef __cplusplus
}
......
......@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
/* $XFree86: xc/include/Xfuncs.h,v 3.9 2001/12/14 19:53:25 dawes Exp $ */
/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */
#ifndef _XFUNCS_H_
#define _XFUNCS_H_
......@@ -45,10 +45,6 @@ int bcmp();
void bcopy();
#define bzero(b,len) memset(b, 0, len)
#define bcmp(b1,b2,len) memcmp(b1, b2, len)
#elif defined(__EMX__)
#include <strings.h>
/* bcopy, bcmp, bzero declared */
#define _XFUNCS_H_INCLUDED_STRING_H
#else
#include <string.h>
#define _XFUNCS_H_INCLUDED_STRING_H
......
/* $XFree86: xc/include/Xmd.h,v 3.14 2001/12/14 19:53:25 dawes Exp $ */
/* $XFree86: xc/include/Xmd.h,v 3.16 2002/05/31 18:45:39 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
......@@ -62,7 +62,8 @@ SOFTWARE.
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64__))
(defined(__hppa__) && defined(__LP64__)) || \
defined(__x86_64__) || defined(x86_64)
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
......@@ -153,17 +154,13 @@ typedef unsigned char CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
#ifndef __EMX__
#ifndef I_NEED_OS2_H
typedef CARD8 BYTE;
typedef CARD8 BOOL;
#else /* __EMX__ */
/*
* This is bad style, but the central include file <os2.h> declares them
* as well
*/
#define BYTE CARD8
#define BOOL CARD8
#endif /* __EMX__ */
typedef CARD8 BOOL;
#else
#define BYTE CARD8
#define BOOL CARD8
#endif
/*
* definitions for sign-extending bitfields on 64-bit architectures
......
......@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
* The X Window System is a Trademark of The Open Group.
*
*/
/* $XFree86: xc/include/Xos.h,v 3.36 2001/12/14 19:53:26 dawes Exp $ */
/* $XFree86: xc/include/Xos.h,v 3.38 2002/05/31 18:45:39 dawes Exp $ */
/* This is a collection of things to try and minimize system dependencies
* in a "signficant" number of source files.
......@@ -155,11 +155,6 @@ extern int sys_nerr;
#endif
#endif /* X_NOT_POSIX else */
#ifdef CSRG_BASED
#include <stdlib.h>
#include <unistd.h>
#endif /* CSRG_BASED */
/*
* Get struct timeval and struct tm
*/
......@@ -243,7 +238,7 @@ typedef unsigned long fd_mask;
#endif
#endif /* XPG4 else */
#ifdef __EMX__
#ifdef __UNIXOS2__
typedef unsigned long fd_mask;
#include <limits.h>
#define MAX_PATH _POSIX_PATH_MAX
......
......@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/include/Xos_r.h,v 1.15 2001/12/14 19:53:26 dawes Exp $ */
/* $XFree86: xc/include/Xos_r.h,v 1.18 2002/08/28 23:08:22 torrey Exp $ */
/*
* Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
......@@ -228,6 +228,7 @@ extern void XtProcessUnlock(
# endif
#endif
#undef X_NEEDS_PWPARAMS
#if !defined(X_INCLUDE_PWD_H) || defined(_XOS_INCLUDED_PWD_H)
/* Do nothing */
......@@ -242,6 +243,7 @@ typedef int _Xgetpwparams; /* dummy */
#elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
/* UnixWare 2.0, or other systems with thread support but no _r API. */
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
char pwbuf[1024];
......@@ -254,7 +256,8 @@ typedef struct {
* fields.
*/
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
defined(__APPLE__)
static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
{
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
......@@ -324,8 +327,9 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
(_Xos_processUnlock), \
(p).pwp )
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
char pwbuf[X_LINE_MAX];
......@@ -356,6 +360,7 @@ typedef struct {
extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
# endif
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
char pwbuf[X_LINE_MAX];
......@@ -614,7 +619,8 @@ typedef struct {
# endif
} _Xreaddirparams;
# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS)
# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
defined(AIXV4) || defined(__APPLE__)
/* AIX defines the draft POSIX symbol, but uses the final API. */
/* POSIX final API, returns (int)0 on success. */
# if defined(__osf__)
......
......@@ -25,7 +25,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/include/Xosdefs.h,v 3.19 2001/12/19 21:37:28 dawes Exp $ */
/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
#ifndef _XOSDEFS_H_
#define _XOSDEFS_H_
......@@ -120,7 +120,7 @@ in this Software without prior written authorization from The Open Group.
#define X_NOT_STDC_ENV
#endif
#ifdef __EMX__
#ifdef __UNIXOS2__
#define USGISH
#define NULL_NOT_ZERO
#endif
......
......@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.47 2001/12/16 18:19:50 keithp Exp $
XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.49 2002/10/16 00:31:25 dawes Exp $
#if BuildScreenSaverExt || BuildScreenSaveLibrary
SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
......@@ -48,27 +48,36 @@ RANDRHEADERS = randr.h randrproto.h
XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
xtraplibp.h xtrapproto.h
#endif
#if BuildXResExt || BuildXResLibrary
XRESHEADERS = XRes.h XResproto.h
#endif
EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
$(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
$(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \
$(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
$(XTRAPHEADERS)
$(XTRAPHEADERS) $(XRESHEADERS)
HEADERS = Xext.h multibuf.h shape.h sync.h XShm.h MITMisc.h \
HEADERS = Xext.h \
xcmiscstr.h \
MITMisc.h mitmiscstr.h \
bigreqstr.h \
extutil.h \
XI.h XInput.h XIproto.h \
XTest.h xtestext1.h \
XTest.h xtestext1.h xteststr.h \
XIE.h XIEproto.h XIEprotost.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
Xdbe.h Xdbeproto.h \
Xag.h Xagstr.h Xagsrv.h \
XShm.h shmstr.h \
$(EXTRAHEADERS) \
multibuf.h multibufst.h \
record.h recordstr.h \
lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h \
lbxopts.h lbxstr.h lbxzlib.h \
security.h securstr.h \
shape.h shapestr.h \
sync.h syncstr.h \
Print.h Printstr.h \
Xcup.h Xcupstr.h \
dpms.h dpmsstr.h \
......
......@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.8 2001/08/01 00:44:35 tsi Exp $ */
/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */
#ifndef _XKBGEOM_H_
#define _XKBGEOM_H_
......@@ -113,7 +113,7 @@ typedef struct _XkbShape {
XkbOutlinePtr primary;
XkbBoundsRec bounds;
} XkbShapeRec, *XkbShapePtr;
#define XkbOutlineIndex(s,o) ((o)-&(s)->outlines[0])
#define XkbOutlineIndex(s,o) ((int)((o)-&(s)->outlines[0]))
typedef struct _XkbShapeDoodad {
Atom name;
......@@ -295,7 +295,7 @@ typedef struct _XkbGeometry {
XkbDoodadPtr doodads;
XkbKeyAliasPtr key_aliases;
} XkbGeometryRec;
#define XkbGeomColorIndex(g,c) ((c)-&(g)->colors[0])
#define XkbGeomColorIndex(g,c) ((int)((c)-&(g)->colors[0]))
#define XkbGeomPropertiesMask (1<<0)
#define XkbGeomColorsMask (1<<1)
......
......@@ -20,7 +20,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
/* $XFree86: xc/include/extensions/XLbx.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
#ifndef _XLBX_H_
#define _XLBX_H_
......@@ -150,6 +150,8 @@ Bool XLbxQueryVersion(
#endif
);
int XLbxGetEventBase(Display *dpy);
_XFUNCPROTOEND
#endif
......
/*
Copyright (c) 2002 XFree86 Inc
*/
/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
#ifndef _XRES_H
#define _XRES_H
#include <X11/Xfuncproto.h>
typedef struct {
XID resource_base;
XID resource_mask;
} XResClient;
typedef struct {
Atom resource_type;
unsigned int count;
} XResType;
_XFUNCPROTOBEGIN
Bool XResQueryExtension (
Display *dpy,
int *event_base,
int *error_base
);
Status XResQueryVersion (
Display *dpy,
int *major,
int *minor
);
Status XResQueryClients (
Display *dpy,
int *num_clients,
XResClient **clients
);
Status XResQueryClientResources (
Display *dpy,
XID xid,
int *num_types,
XResType **types
);
Status XResQueryClientPixmapBytes (
Display *dpy,
XID xid,
unsigned long *bytes
);
_XFUNCPROTOEND
#endif /* _XRES_H */
/*
Copyright (c) 2002 XFree86 Inc
*/
/* $XFree86: xc/include/extensions/XResproto.h,v 1.2 2002/03/10 22:05:51 mvojkovi Exp $ */
#ifndef _XRESPROTO_H
#define _XRESPROTO_H
#define XRES_MAJOR_VERSION 1
#define XRES_MINOR_VERSION 0
#define XRES_NAME "X-Resource"
#define X_XResQueryVersion 0
#define X_XResQueryClients 1
#define X_XResQueryClientResources 2
#define X_XResQueryClientPixmapBytes 3
typedef struct {
CARD32 resource_base;
CARD32 resource_mask;
} xXResClient;
#define sz_xXResClient 8
typedef struct {
CARD32 resource_type;
CARD32 count;
} xXResType;
#define sz_xXResType 8
/* XResQueryVersion */
typedef struct _XResQueryVersion {
CARD8 reqType;
CARD8 XResReqType;
CARD16 length B16;
CARD8 client_major;
CARD8 client_minor;
CARD16 unused B16;
} 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;
} xXResQueryVersionReply;
#define sz_xXResQueryVersionReply 32
/* XResQueryClients */
typedef struct _XResQueryClients {
CARD8 reqType;
CARD8 XResReqType;
CARD16 length B16;
} 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;
} xXResQueryClientsReply;
#define sz_xXResQueryClientsReply 32
/* XResQueryClientResources */
typedef struct _XResQueryClientResources {
CARD8 reqType;
CARD8 XResReqType;
CARD16 length B16;
CARD32 xid B32;
} 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;
} xXResQueryClientResourcesReply;
#define sz_xXResQueryClientResourcesReply 32
/* XResQueryClientPixmapBytes */
typedef struct _XResQueryClientPixmapBytes {
CARD8 reqType;
CARD8 XResReqType;
CARD16 length B16;
CARD32 xid B32;
} 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;
} xXResQueryClientPixmapBytesReply;
#define sz_xXResQueryClientPixmapBytesReply 32
#endif /* _XRESPROTO_H */
/* $XFree86: xc/include/extensions/XShm.h,v 1.8 2001/12/14 19:53:28 dawes Exp $ */
/* $XFree86: xc/include/extensions/XShm.h,v 1.9 2002/10/16 01:10:09 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
......@@ -73,7 +73,13 @@ _XFUNCPROTOBEGIN
Bool XShmQueryExtension(
#if NeedFunctionPrototypes
Display* /* dpy */
Display* /* dpy */
#endif
);
int XShmGetEventBase(
#if NeedFunctionPrototypes
Display* /* dpy */
#endif
);
......
/* $XFree86: xc/include/extensions/Xinerama.h,v 3.2 2000/03/01 01:04:20 dawes Exp $ */
/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
#ifndef _Xinerama_h
#define _Xinerama_h
......@@ -11,6 +11,8 @@ typedef struct {
short height;
} XineramaScreenInfo;
_XFUNCPROTOBEGIN
Bool XineramaQueryExtension (
Display *dpy,
int *event_base,
......@@ -40,5 +42,7 @@ XineramaQueryScreens(
int *number
);
_XFUNCPROTOEND
#endif /* _Xinerama_h */
/*
* $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
* $XFree86: xc/include/extensions/randr.h,v 1.6 2002/10/14 18:01:38 keithp Exp $
*