summaryrefslogtreecommitdiff
path: root/xc/include
diff options
context:
space:
mode:
Diffstat (limited to 'xc/include')
-rw-r--r--xc/include/GL/glx.h52
-rw-r--r--xc/include/XF86keysym.h96
-rw-r--r--xc/include/Xalloca.h11
-rw-r--r--xc/include/extensions/Imakefile4
-rw-r--r--xc/include/extensions/XKB.h6
-rw-r--r--xc/include/extensions/XKBsrv.h10
-rw-r--r--xc/include/extensions/XShm.h4
-rw-r--r--xc/include/extensions/render.h9
-rw-r--r--xc/include/extensions/renderproto.h20
-rw-r--r--xc/include/extensions/security.h4
-rw-r--r--xc/include/extensions/xf86misc.h14
-rw-r--r--xc/include/extensions/xf86mscstr.h27
-rw-r--r--xc/include/extensions/xf86vmode.h11
-rw-r--r--xc/include/extensions/xf86vmstr.h22
14 files changed, 262 insertions, 28 deletions
diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h
index bd9ab9e55..b02a237d8 100644
--- a/xc/include/GL/glx.h
+++ b/xc/include/GL/glx.h
@@ -1,7 +1,7 @@
#ifndef __GLX_glx_h__
#define __GLX_glx_h__
-/* $XFree86: xc/include/GL/glx.h,v 1.9 2002/02/22 21:32:50 dawes Exp $ */
+/* $XFree86: xc/include/GL/glx.h,v 1.10 2002/10/30 08:52:36 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -109,7 +109,7 @@ extern void glXSelectEvent (Display *dpy, GLXDrawable draw, unsigned long event_
extern void glXGetSelectedEvent (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
/* GLX 1.4 and later */
-extern void (*glXGetProcAddress(const GLubyte *procname))();
+extern void (*glXGetProcAddress(const GLubyte *procname))(void);
#ifndef GLX_GLXEXT_LEGACY
@@ -130,8 +130,56 @@ extern int glXQueryContextInfoEXT (Display *dpy, GLXContext ctx, int attribute,
extern Display * glXGetCurrentDisplayEXT (void);
extern void (*glXGetProcAddressARB(const GLubyte *procName))( void );
+
+
#endif /* GLX_GLXEXT_LEGACY */
+
+/**
+ ** The following aren't in glxext.h yet.
+ **/
+
+
+/*
+ * ???. GLX_NV_vertex_array_range
+ */
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range
+
+extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void glXFreeMemoryNV(GLvoid *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
+
+#endif /* GLX_NV_vertex_array_range */
+
+
+
+/*
+ * ???. GLX_MESA_agp_offset
+ */
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+
+extern GLuint glXGetAGPOffsetMESA(const GLvoid *pointer);
+typedef GLuint (* PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *pointer);
+
+#endif /* GLX_MESA_agp_offset */
+
+/*
+ * ???. GLX_ARB_render_texture
+ */
+#ifndef GLX_ARB_render_texture
+#define GLX_ARB_render_texture 1
+
+Bool glXBindTexImageARB( Display *dpy, GLXPbuffer pbuffer, int buffer );
+Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer );
+Bool glXDrawableAttribARB( Display *dpy, GLXDrawable draw, const int *attribList );
+
+#endif
+
+
+
/*** Should these go here, or in another header? */
/*
** GLX Events
diff --git a/xc/include/XF86keysym.h b/xc/include/XF86keysym.h
index 4aa606180..b713aec5f 100644
--- a/xc/include/XF86keysym.h
+++ b/xc/include/XF86keysym.h
@@ -1,9 +1,9 @@
-/* $XFree86: xc/include/XF86keysym.h,v 1.12 2001/12/26 22:28:25 dawes Exp $ */
+/* $XFree86: xc/include/XF86keysym.h,v 1.17 2003/02/14 22:02:26 dawes Exp $ */
/*
* XFree86 vendor specific keysyms.
*
- * The XFree86 keysym range is 0x1008FF01 - 0x1008FFFF.
+ * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
*
* When adding new entries, the xc/lib/XKeysymDB file should also be
* updated to make the new entries visible to Xlib.
@@ -21,6 +21,12 @@
/*
* Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new
* keysyms that don't fit into any of the groups below.
+ *
+ * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
+ * and should be used first for new keysyms.
+ *
+ * Check in keysymdef.h for generic symbols before adding new XFree86-specific
+ * symbols here.
*/
@@ -77,7 +83,8 @@
#define XF86XK_BrightnessAdjust 0x1008FF3B
#define XF86XK_Finance 0x1008FF3C
#define XF86XK_Community 0x1008FF3D
-/* Allocate 0x1008FF3E-F next */
+#define XF86XK_AudioRewind 0x1008FF3E
+#define XF86XK_XF86BackForward 0x1008FF3F
#define XF86XK_Launch0 0x1008FF40
#define XF86XK_Launch1 0x1008FF41
#define XF86XK_Launch2 0x1008FF42
@@ -95,4 +102,87 @@
#define XF86XK_LaunchE 0x1008FF4E
#define XF86XK_LaunchF 0x1008FF4F
+#define XF86XK_ApplicationLeft 0x1008FF50
+#define XF86XK_ApplicationRight 0x1008FF51
+#define XF86XK_Book 0x1008FF52
+#define XF86XK_CD 0x1008FF53
+#define XF86XK_Calculater 0x1008FF54
+#define XF86XK_Clear 0x1008FF55
+#define XF86XK_Close 0x1008FF56
+#define XF86XK_Copy 0x1008FF57
+#define XF86XK_Cut 0x1008FF58
+#define XF86XK_Display 0x1008FF59
+#define XF86XK_DOS 0x1008FF5A
+#define XF86XK_Documents 0x1008FF5B
+#define XF86XK_Excel 0x1008FF5C
+#define XF86XK_Explorer 0x1008FF5D
+#define XF86XK_Game 0x1008FF5E
+#define XF86XK_Go 0x1008FF5F
+#define XF86XK_iTouch 0x1008FF60
+#define XF86XK_LogOff 0x1008FF61
+#define XF86XK_Market 0x1008FF62
+#define XF86XK_Meeting 0x1008FF63
+#define XF86XK_MenuKB 0x1008FF65
+#define XF86XK_MenuPB 0x1008FF66
+#define XF86XK_MySites 0x1008FF67
+#define XF86XK_New 0x1008FF68
+#define XF86XK_News 0x1008FF69
+#define XF86XK_OfficeHome 0x1008FF6A
+#define XF86XK_Open 0x1008FF6B
+#define XF86XK_Option 0x1008FF6C
+#define XF86XK_Paste 0x1008FF6D
+#define XF86XK_Phone 0x1008FF6E
+#define XF86XK_Q 0x1008FF70
+#define XF86XK_Reply 0x1008FF72
+#define XF86XK_Reload 0x1008FF73
+#define XF86XK_RotateWindows 0x1008FF74
+#define XF86XK_RotationPB 0x1008FF75
+#define XF86XK_RotationKB 0x1008FF76
+#define XF86XK_Save 0x1008FF77
+#define XF86XK_ScrollUp 0x1008FF78
+#define XF86XK_ScrollDown 0x1008FF79
+#define XF86XK_ScrollClick 0x1008FF7A
+#define XF86XK_Send 0x1008FF7B
+#define XF86XK_Spell 0x1008FF7C
+#define XF86XK_SplitScreen 0x1008FF7D
+#define XF86XK_Support 0x1008FF7E
+#define XF86XK_TaskPane 0x1008FF7F
+#define XF86XK_Terminal 0x1008FF80
+#define XF86XK_Tools 0x1008FF81
+#define XF86XK_Travel 0x1008FF82
+#define XF86XK_UserPB 0x1008FF84
+#define XF86XK_User1KB 0x1008FF85
+#define XF86XK_User2KB 0x1008FF86
+#define XF86XK_Video 0x1008FF87
+#define XF86XK_WheelButton 0x1008FF88
+#define XF86XK_Word 0x1008FF89
+#define XF86XK_Xfer 0x1008FF8A
+#define XF86XK_ZoomIn 0x1008FF8B
+#define XF86XK_ZoomOut 0x1008FF8C
+
+#define XF86XK_Away 0x1008FF8D
+#define XF86XK_Messenger 0x1008FF8E
+#define XF86XK_WebCam 0x1008FF8F
+#define XF86XK_MailForward 0x1008FF90
+#define XF86XK_Pictures 0x1008FF91
+#define XF86XK_Music 0x1008FF92
+
+/* Keys for special action keys (hot keys) */
+#define XF86XK_Switch_VT_1 0x1008FE01
+#define XF86XK_Switch_VT_2 0x1008FE02
+#define XF86XK_Switch_VT_3 0x1008FE03
+#define XF86XK_Switch_VT_4 0x1008FE04
+#define XF86XK_Switch_VT_5 0x1008FE05
+#define XF86XK_Switch_VT_6 0x1008FE06
+#define XF86XK_Switch_VT_7 0x1008FE07
+#define XF86XK_Switch_VT_8 0x1008FE08
+#define XF86XK_Switch_VT_9 0x1008FE09
+#define XF86XK_Switch_VT_10 0x1008FE0A
+#define XF86XK_Switch_VT_11 0x1008FE0B
+#define XF86XK_Switch_VT_12 0x1008FE0C
+
+#define XF86XK_Ungrab 0x1008FE20
+#define XF86XK_ClearGrab 0x1008FE21
+#define XF86XK_Next_VMode 0x1008FE22
+#define XF86XK_Prev_VMode 0x1008FE23
diff --git a/xc/include/Xalloca.h b/xc/include/Xalloca.h
index 897394a00..f010006a4 100644
--- a/xc/include/Xalloca.h
+++ b/xc/include/Xalloca.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/include/Xalloca.h,v 3.10 2001/12/14 19:53:25 dawes Exp $ */
+/* $XFree86: xc/include/Xalloca.h,v 3.11 2002/12/01 20:08:41 tsi Exp $ */
/*
* The purpose of this header is to define the macros ALLOCATE_LOCAL and
@@ -83,7 +83,6 @@ from The Open Group.
# else /* NCR */
# define ALLOCATE_LOCAL(size) alloca(size)
# endif
-# define DEALLOCATE_LOCAL(ptr) /* as nothing */
# endif /* defined(__HIGHC__) */
@@ -92,7 +91,6 @@ from The Open Group.
# define alloca __builtin_alloca
# endif /* !alloca */
# define ALLOCATE_LOCAL(size) alloca((int)(size))
-# define DEALLOCATE_LOCAL(ptr) /* as nothing */
# else /* ! __GNUC__ */
/*
@@ -118,7 +116,6 @@ from The Open Group.
# endif /* __QNX__ */
# endif /* __sgi */
# define ALLOCATE_LOCAL(size) alloca((int)(size))
-# define DEALLOCATE_LOCAL(ptr) /* as nothing */
# endif /* who does alloca */
# endif /* NCR */
# endif /* __GNUC__ */
@@ -133,6 +130,10 @@ from The Open Group.
# define ALLOCATE_LOCAL(_size) ALLOCATE_LOCAL_FALLBACK undefined!
# define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK undefined!
# endif /* defined(ALLOCATE_LOCAL_FALLBACK && DEALLOCATE_LOCAL_FALLBACK) */
-#endif /* !defined(ALLOCATE_LOCAL) */
+#else
+# if !defined(DEALLOCATE_LOCAL)
+# define DEALLOCATE_LOCAL(_ptr) do {} while(0)
+# endif
+#endif /* defined(ALLOCATE_LOCAL) */
#endif /* XALLOCA_H */
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index 2f9717d07..5306ff2b0 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -3,9 +3,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.49 2002/10/16 00:31:25 dawes Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.53 2002/12/16 16:18:49 dawes Exp $
-#if BuildScreenSaverExt || BuildScreenSaveLibrary
+#if BuildScreenSaverExt || BuildScreenSaverLibrary
SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
#endif
diff --git a/xc/include/extensions/XKB.h b/xc/include/extensions/XKB.h
index 1b427e3e3..8867c47ae 100644
--- a/xc/include/extensions/XKB.h
+++ b/xc/include/extensions/XKB.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/XKB.h,v 1.4 2001/01/17 17:53:17 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XKB.h,v 1.5 2002/11/20 04:49:01 dawes Exp $ */
#ifndef _XKB_H_
#define _XKB_H_
@@ -502,6 +502,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbSA_LastAction XkbSA_DeviceValuator
#define XkbSA_NumActions (XkbSA_LastAction+1)
+#if defined(XF86DDXACTIONS) || defined(XFree86Server)
+#define XkbSA_XFree86Private 0x86
+#endif
+
/*
* Specifies the key actions that clear latched groups or modifiers.
*/
diff --git a/xc/include/extensions/XKBsrv.h b/xc/include/extensions/XKBsrv.h
index 65867c00e..fe05df375 100644
--- a/xc/include/extensions/XKBsrv.h
+++ b/xc/include/extensions/XKBsrv.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/XKBsrv.h,v 3.21 2001/08/23 14:46:27 alanh Exp $ */
+/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */
#ifndef _XKBSRV_H_
#define _XKBSRV_H_
@@ -1067,6 +1067,14 @@ extern int XkbDDXSwitchScreen(
#endif
);
+extern int XkbDDXPrivate(
+#if NeedFunctionPrototypes
+ DeviceIntPtr /* dev */,
+ KeyCode /* key */,
+ XkbAction * /* act */
+#endif
+);
+
extern void XkbDisableComputedAutoRepeats(
#if NeedFunctionPrototypes
DeviceIntPtr /* pXDev */,
diff --git a/xc/include/extensions/XShm.h b/xc/include/extensions/XShm.h
index d20283eb7..8be6dceda 100644
--- a/xc/include/extensions/XShm.h
+++ b/xc/include/extensions/XShm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/XShm.h,v 1.9 2002/10/16 01:10:09 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XShm.h,v 1.10 2002/11/08 00:46:27 alanh Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -175,6 +175,8 @@ _XFUNCPROTOEND
#else /* _XSHM_SERVER_ */
#include "screenint.h"
+#include "pixmap.h"
+#include "gc.h"
extern void ShmRegisterFbFuncs(
#if NeedFunctionPrototypes
diff --git a/xc/include/extensions/render.h b/xc/include/extensions/render.h
index b3f400de0..a596667ab 100644
--- a/xc/include/extensions/render.h
+++ b/xc/include/extensions/render.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/include/extensions/render.h,v 1.9 2002/09/29 23:39:43 keithp Exp $
+ * $XFree86: xc/include/extensions/render.h,v 1.11 2002/11/23 02:34:45 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*
@@ -33,11 +33,11 @@ typedef unsigned long PictFormat;
#define RENDER_NAME "RENDER"
#define RENDER_MAJOR 0
-#define RENDER_MINOR 6
+#define RENDER_MINOR 8
#define X_RenderQueryVersion 0
#define X_RenderQueryPictFormats 1
-#define X_RenderQueryPictIndexValues 2
+#define X_RenderQueryPictIndexValues 2 /* 0.7 */
#define X_RenderQueryDithers 3
#define X_RenderCreatePicture 4
#define X_RenderChangePicture 5
@@ -68,7 +68,8 @@ typedef unsigned long PictFormat;
#define X_RenderSetPictureTransform 28
#define X_RenderQueryFilters 29
#define X_RenderSetPictureFilter 30
-#define RenderNumberRequests (X_RenderSetPictureFilter+1)
+#define X_RenderCreateAnimCursor 31
+#define RenderNumberRequests (X_RenderCreateAnimCursor+1)
#define BadPictFormat 0
#define BadPicture 1
diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h
index 5f6b3e9bb..7717d9fb1 100644
--- a/xc/include/extensions/renderproto.h
+++ b/xc/include/extensions/renderproto.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.13 2002/11/23 02:34:45 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*
@@ -550,6 +550,24 @@ typedef struct {
#define sz_xRenderSetPictureFilterReq 12
+/* 0.8 and higher */
+
+typedef struct {
+ Cursor cursor B32;
+ CARD32 delay B32;
+} xAnimCursorElt;
+
+#define sz_xAnimCursorElt 8
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Cursor cid B32;
+} xRenderCreateAnimCursorReq;
+
+#define sz_xRenderCreateAnimCursorReq 8
+
#undef Window
#undef Drawable
#undef Font
diff --git a/xc/include/extensions/security.h b/xc/include/extensions/security.h
index a537c5110..1f6019c3a 100644
--- a/xc/include/extensions/security.h
+++ b/xc/include/extensions/security.h
@@ -24,7 +24,7 @@ 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/extensions/security.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
+/* $XFree86: xc/include/extensions/security.h,v 1.4 2002/11/08 00:46:27 alanh Exp $ */
#ifndef _SECURITY_H
#define _SECURITY_H
@@ -110,6 +110,8 @@ typedef struct {
#include "input.h" /* for DeviceIntPtr */
#include "property.h" /* for PropertyPtr */
+#include "pixmap.h" /* for DrawablePtr */
+#include "resource.h" /* for RESTYPE */
/* resource type to pass in LookupIDByType for authorizations */
extern RESTYPE SecurityAuthorizationResType;
diff --git a/xc/include/extensions/xf86misc.h b/xc/include/extensions/xf86misc.h
index f417a4cd7..3cdd2d7ec 100644
--- a/xc/include/extensions/xf86misc.h
+++ b/xc/include/extensions/xf86misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.15 2002/04/04 14:05:35 eich Exp $ */
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc
@@ -22,6 +22,7 @@
#define X_XF86MiscSetKbdSettings 6
#define X_XF86MiscSetGrabKeysState 7
#define X_XF86MiscSetClientVersion 8
+#define X_XF86MiscGetFilePaths 9
#define XF86MiscNumberEvents 0
@@ -103,6 +104,12 @@ typedef struct {
Bool servnumlock;
} XF86MiscKbdSettings;
+typedef struct {
+ char* configfile;
+ char* modulepath;
+ char* logfile;
+} XF86MiscFilePaths;
+
Bool XF86MiscQueryVersion(
Display* /* dpy */,
int* /* majorVersion */,
@@ -144,6 +151,11 @@ int XF86MiscSetGrabKeysState(
Bool /* enabled */
);
+Status XF86MiscGetFilePaths(
+ Display* /* dpy */,
+ XF86MiscFilePaths* /* file paths/locations */
+);
+
_XFUNCPROTOEND
#endif
diff --git a/xc/include/extensions/xf86mscstr.h b/xc/include/extensions/xf86mscstr.h
index f01072a76..70904aa68 100644
--- a/xc/include/extensions/xf86mscstr.h
+++ b/xc/include/extensions/xf86mscstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.11 2002/04/04 14:05:35 eich Exp $ */
+/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc
@@ -14,7 +14,7 @@
#define XF86MISCNAME "XFree86-Misc"
#define XF86MISC_MAJOR_VERSION 0 /* current version numbers */
-#define XF86MISC_MINOR_VERSION 6
+#define XF86MISC_MINOR_VERSION 7
typedef struct _XF86MiscQueryVersion {
CARD8 reqType; /* always XF86MiscReqCode */
@@ -186,4 +186,27 @@ typedef struct _XF86MiscSetClientVersion {
} xXF86MiscSetClientVersionReq;
#define sz_xXF86MiscSetClientVersionReq 8
+typedef struct _XF86MiscGetFilePaths {
+ CARD8 reqType; /* always XF86MiscReqCode */
+ CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */
+ CARD16 length B16;
+} xXF86MiscGetFilePathsReq;
+#define sz_xXF86MiscGetFilePathsReq 4
+
+typedef struct {
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD16 configlen B16;
+ CARD16 modulelen B16;
+ CARD16 loglen B16;
+ CARD16 pad2 B16;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXF86MiscGetFilePathsReply;
+#define sz_xXF86MiscGetFilePathsReply 32
+
#endif /* _XF86MISCSTR_H_ */
diff --git a/xc/include/extensions/xf86vmode.h b/xc/include/extensions/xf86vmode.h
index facb1abc3..99e632384 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.30 2001/05/07 20:09:50 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
/*
Copyright 1995 Kaleb S. KEITHLEY
@@ -59,6 +59,7 @@ from Kaleb S. KEITHLEY
#define X_XF86VidModeGetGammaRamp 17
#define X_XF86VidModeSetGammaRamp 18
#define X_XF86VidModeGetGammaRampSize 19
+#define X_XF86VidModeGetPermissions 20
#define CLKFLAG_PROGRAMABLE 1
@@ -83,6 +84,9 @@ from Kaleb S. KEITHLEY
#define XF86VidModeZoomLocked 6
#define XF86VidModeNumberErrors (XF86VidModeZoomLocked + 1)
+#define XF86VM_READ_PERMISSION 1
+#define XF86VM_WRITE_PERMISSION 2
+
#ifndef _XF86VIDMODE_SERVER_
typedef struct {
@@ -305,6 +309,11 @@ Bool XF86VidModeGetGammaRampSize(
int* /* size */
);
+Bool XF86VidModeGetPermissions(
+ Display* /* dpy */,
+ int /* screen */,
+ int* /* permissions */
+);
_XFUNCPROTOEND
diff --git a/xc/include/extensions/xf86vmstr.h b/xc/include/extensions/xf86vmstr.h
index 987714e9a..db6f6e6bf 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.27 2001/08/01 00:44:36 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes 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 1
+#define XF86VIDMODE_MINOR_VERSION 2
/*
* major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
* major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
@@ -80,12 +80,14 @@ typedef struct _XF86VidModeGetModeLine {
xXF86VidModeGetAllModeLinesReq,
xXF86VidModeGetMonitorReq,
xXF86VidModeGetViewPortReq,
- xXF86VidModeGetDotClocksReq;
+ xXF86VidModeGetDotClocksReq,
+ xXF86VidModeGetPermissionsReq;
#define sz_xXF86VidModeGetModeLineReq 8
#define sz_xXF86VidModeGetAllModeLinesReq 8
#define sz_xXF86VidModeGetMonitorReq 8
#define sz_xXF86VidModeGetViewPortReq 8
#define sz_xXF86VidModeGetDotClocksReq 8
+#define sz_xXF86VidModeGetPermissionsReq 8
typedef struct {
BYTE type; /* X_Reply */
@@ -541,6 +543,20 @@ typedef struct {
} xXF86VidModeGetGammaRampSizeReply;
#define sz_xXF86VidModeGetGammaRampSizeReply 32
+typedef struct {
+ BYTE type;
+ BOOL pad;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 permissions B32;
+ CARD32 pad1 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+} xXF86VidModeGetPermissionsReply;
+#define sz_xXF86VidModeGetPermissionsReply 32
+
#endif /* _XF86VIDMODESTR_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-29 08:28:08 +0000