aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/include')
-rw-r--r--nx-X11/include/GL/Imakefile2
-rw-r--r--nx-X11/include/GL/glu.h328
-rw-r--r--nx-X11/include/Imakefile1
-rw-r--r--nx-X11/include/ap_keysym.h51
-rw-r--r--nx-X11/include/extensions/Imakefile9
-rw-r--r--nx-X11/include/extensions/XInput.h1123
-rw-r--r--nx-X11/include/extensions/XvMClib.h215
-rw-r--r--nx-X11/include/extensions/Xvlib.h385
-rw-r--r--nx-X11/include/extensions/vldXvMC.h175
9 files changed, 4 insertions, 2285 deletions
diff --git a/nx-X11/include/GL/Imakefile b/nx-X11/include/GL/Imakefile
index 8719813e2..8afed568b 100644
--- a/nx-X11/include/GL/Imakefile
+++ b/nx-X11/include/GL/Imakefile
@@ -3,7 +3,7 @@ LinkSourceFile(glext.h, $(MESASRCDIR)/include/GL)
LinkSourceFile(glxext.h, $(MESASRCDIR)/include/GL)
LinkSourceFile(osmesa.h, $(MESASRCDIR)/include/GL)
-GLXHEADERS = gl.h glext.h glu.h glx.h glxint.h glxmd.h glxproto.h \
+GLXHEADERS = gl.h glext.h glx.h glxint.h glxmd.h glxproto.h \
glxtokens.h osmesa.h glxext.h
HEADERS = $(GLXHEADERS)
diff --git a/nx-X11/include/GL/glu.h b/nx-X11/include/GL/glu.h
deleted file mode 100644
index e59ad6f99..000000000
--- a/nx-X11/include/GL/glu.h
+++ /dev/null
@@ -1,328 +0,0 @@
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#ifndef __glu_h__
-#define __glu_h__
-
-#include <GL/gl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*************************************************************/
-
-/* Extensions */
-#define GLU_EXT_object_space_tess 1
-#define GLU_EXT_nurbs_tessellator 1
-
-/* Boolean */
-#define GLU_FALSE 0
-#define GLU_TRUE 1
-
-/* Version */
-#define GLU_VERSION_1_1 1
-#define GLU_VERSION_1_2 1
-#define GLU_VERSION_1_3 1
-
-/* StringName */
-#define GLU_VERSION 100800
-#define GLU_EXTENSIONS 100801
-
-/* ErrorCode */
-#define GLU_INVALID_ENUM 100900
-#define GLU_INVALID_VALUE 100901
-#define GLU_OUT_OF_MEMORY 100902
-#define GLU_INVALID_OPERATION 100904
-
-/* NurbsDisplay */
-/* GLU_FILL */
-#define GLU_OUTLINE_POLYGON 100240
-#define GLU_OUTLINE_PATCH 100241
-
-/* NurbsCallback */
-#define GLU_NURBS_ERROR 100103
-#define GLU_ERROR 100103
-#define GLU_NURBS_BEGIN 100164
-#define GLU_NURBS_BEGIN_EXT 100164
-#define GLU_NURBS_VERTEX 100165
-#define GLU_NURBS_VERTEX_EXT 100165
-#define GLU_NURBS_NORMAL 100166
-#define GLU_NURBS_NORMAL_EXT 100166
-#define GLU_NURBS_COLOR 100167
-#define GLU_NURBS_COLOR_EXT 100167
-#define GLU_NURBS_TEXTURE_COORD 100168
-#define GLU_NURBS_TEX_COORD_EXT 100168
-#define GLU_NURBS_END 100169
-#define GLU_NURBS_END_EXT 100169
-#define GLU_NURBS_BEGIN_DATA 100170
-#define GLU_NURBS_BEGIN_DATA_EXT 100170
-#define GLU_NURBS_VERTEX_DATA 100171
-#define GLU_NURBS_VERTEX_DATA_EXT 100171
-#define GLU_NURBS_NORMAL_DATA 100172
-#define GLU_NURBS_NORMAL_DATA_EXT 100172
-#define GLU_NURBS_COLOR_DATA 100173
-#define GLU_NURBS_COLOR_DATA_EXT 100173
-#define GLU_NURBS_TEXTURE_COORD_DATA 100174
-#define GLU_NURBS_TEX_COORD_DATA_EXT 100174
-#define GLU_NURBS_END_DATA 100175
-#define GLU_NURBS_END_DATA_EXT 100175
-
-/* NurbsError */
-#define GLU_NURBS_ERROR1 100251
-#define GLU_NURBS_ERROR2 100252
-#define GLU_NURBS_ERROR3 100253
-#define GLU_NURBS_ERROR4 100254
-#define GLU_NURBS_ERROR5 100255
-#define GLU_NURBS_ERROR6 100256
-#define GLU_NURBS_ERROR7 100257
-#define GLU_NURBS_ERROR8 100258
-#define GLU_NURBS_ERROR9 100259
-#define GLU_NURBS_ERROR10 100260
-#define GLU_NURBS_ERROR11 100261
-#define GLU_NURBS_ERROR12 100262
-#define GLU_NURBS_ERROR13 100263
-#define GLU_NURBS_ERROR14 100264
-#define GLU_NURBS_ERROR15 100265
-#define GLU_NURBS_ERROR16 100266
-#define GLU_NURBS_ERROR17 100267
-#define GLU_NURBS_ERROR18 100268
-#define GLU_NURBS_ERROR19 100269
-#define GLU_NURBS_ERROR20 100270
-#define GLU_NURBS_ERROR21 100271
-#define GLU_NURBS_ERROR22 100272
-#define GLU_NURBS_ERROR23 100273
-#define GLU_NURBS_ERROR24 100274
-#define GLU_NURBS_ERROR25 100275
-#define GLU_NURBS_ERROR26 100276
-#define GLU_NURBS_ERROR27 100277
-#define GLU_NURBS_ERROR28 100278
-#define GLU_NURBS_ERROR29 100279
-#define GLU_NURBS_ERROR30 100280
-#define GLU_NURBS_ERROR31 100281
-#define GLU_NURBS_ERROR32 100282
-#define GLU_NURBS_ERROR33 100283
-#define GLU_NURBS_ERROR34 100284
-#define GLU_NURBS_ERROR35 100285
-#define GLU_NURBS_ERROR36 100286
-#define GLU_NURBS_ERROR37 100287
-
-/* NurbsProperty */
-#define GLU_AUTO_LOAD_MATRIX 100200
-#define GLU_CULLING 100201
-#define GLU_SAMPLING_TOLERANCE 100203
-#define GLU_DISPLAY_MODE 100204
-#define GLU_PARAMETRIC_TOLERANCE 100202
-#define GLU_SAMPLING_METHOD 100205
-#define GLU_U_STEP 100206
-#define GLU_V_STEP 100207
-#define GLU_NURBS_MODE 100160
-#define GLU_NURBS_MODE_EXT 100160
-#define GLU_NURBS_TESSELLATOR 100161
-#define GLU_NURBS_TESSELLATOR_EXT 100161
-#define GLU_NURBS_RENDERER 100162
-#define GLU_NURBS_RENDERER_EXT 100162
-
-/* NurbsSampling */
-#define GLU_OBJECT_PARAMETRIC_ERROR 100208
-#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208
-#define GLU_OBJECT_PATH_LENGTH 100209
-#define GLU_OBJECT_PATH_LENGTH_EXT 100209
-#define GLU_PATH_LENGTH 100215
-#define GLU_PARAMETRIC_ERROR 100216
-#define GLU_DOMAIN_DISTANCE 100217
-
-/* NurbsTrim */
-#define GLU_MAP1_TRIM_2 100210
-#define GLU_MAP1_TRIM_3 100211
-
-/* QuadricDrawStyle */
-#define GLU_POINT 100010
-#define GLU_LINE 100011
-#define GLU_FILL 100012
-#define GLU_SILHOUETTE 100013
-
-/* QuadricCallback */
-/* GLU_ERROR */
-
-/* QuadricNormal */
-#define GLU_SMOOTH 100000
-#define GLU_FLAT 100001
-#define GLU_NONE 100002
-
-/* QuadricOrientation */
-#define GLU_OUTSIDE 100020
-#define GLU_INSIDE 100021
-
-/* TessCallback */
-#define GLU_TESS_BEGIN 100100
-#define GLU_BEGIN 100100
-#define GLU_TESS_VERTEX 100101
-#define GLU_VERTEX 100101
-#define GLU_TESS_END 100102
-#define GLU_END 100102
-#define GLU_TESS_ERROR 100103
-#define GLU_TESS_EDGE_FLAG 100104
-#define GLU_EDGE_FLAG 100104
-#define GLU_TESS_COMBINE 100105
-#define GLU_TESS_BEGIN_DATA 100106
-#define GLU_TESS_VERTEX_DATA 100107
-#define GLU_TESS_END_DATA 100108
-#define GLU_TESS_ERROR_DATA 100109
-#define GLU_TESS_EDGE_FLAG_DATA 100110
-#define GLU_TESS_COMBINE_DATA 100111
-
-/* TessContour */
-#define GLU_CW 100120
-#define GLU_CCW 100121
-#define GLU_INTERIOR 100122
-#define GLU_EXTERIOR 100123
-#define GLU_UNKNOWN 100124
-
-/* TessProperty */
-#define GLU_TESS_WINDING_RULE 100140
-#define GLU_TESS_BOUNDARY_ONLY 100141
-#define GLU_TESS_TOLERANCE 100142
-
-/* TessError */
-#define GLU_TESS_ERROR1 100151
-#define GLU_TESS_ERROR2 100152
-#define GLU_TESS_ERROR3 100153
-#define GLU_TESS_ERROR4 100154
-#define GLU_TESS_ERROR5 100155
-#define GLU_TESS_ERROR6 100156
-#define GLU_TESS_ERROR7 100157
-#define GLU_TESS_ERROR8 100158
-#define GLU_TESS_MISSING_BEGIN_POLYGON 100151
-#define GLU_TESS_MISSING_BEGIN_CONTOUR 100152
-#define GLU_TESS_MISSING_END_POLYGON 100153
-#define GLU_TESS_MISSING_END_CONTOUR 100154
-#define GLU_TESS_COORD_TOO_LARGE 100155
-#define GLU_TESS_NEED_COMBINE_CALLBACK 100156
-
-/* TessWinding */
-#define GLU_TESS_WINDING_ODD 100130
-#define GLU_TESS_WINDING_NONZERO 100131
-#define GLU_TESS_WINDING_POSITIVE 100132
-#define GLU_TESS_WINDING_NEGATIVE 100133
-#define GLU_TESS_WINDING_ABS_GEQ_TWO 100134
-
-/*************************************************************/
-
-
-#ifdef __cplusplus
-class GLUnurbs;
-class GLUquadric;
-class GLUtesselator;
-#else
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
-#endif
-
-typedef struct GLUnurbs GLUnurbsObj;
-typedef struct GLUquadric GLUquadricObj;
-typedef struct GLUtesselator GLUtesselatorObj;
-typedef struct GLUtesselator GLUtriangulatorObj;
-
-#define GLU_TESS_MAX_COORD 1.0e150
-
-/* Internal convenience typedefs */
-#ifdef __cplusplus
-typedef GLvoid (*_GLUfuncptr)();
-#else
-typedef GLvoid (*_GLUfuncptr)(GLvoid);
-#endif
-
-extern void gluBeginCurve (GLUnurbs* nurb);
-extern void gluBeginPolygon (GLUtesselator* tess);
-extern void gluBeginSurface (GLUnurbs* nurb);
-extern void gluBeginTrim (GLUnurbs* nurb);
-extern GLint gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
-extern GLint gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
-extern GLint gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-extern GLboolean gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
-extern void gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
-extern void gluDeleteNurbsRenderer (GLUnurbs* nurb);
-extern void gluDeleteQuadric (GLUquadric* quad);
-extern void gluDeleteTess (GLUtesselator* tess);
-extern void gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
-extern void gluEndCurve (GLUnurbs* nurb);
-extern void gluEndPolygon (GLUtesselator* tess);
-extern void gluEndSurface (GLUnurbs* nurb);
-extern void gluEndTrim (GLUnurbs* nurb);
-extern const GLubyte * gluErrorString (GLenum error);
-extern void gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
-extern const GLubyte * gluGetString (GLenum name);
-extern void gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
-extern void gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
-extern void gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
-extern GLUnurbs* gluNewNurbsRenderer (void);
-extern GLUquadric* gluNewQuadric (void);
-extern GLUtesselator* gluNewTess (void);
-extern void gluNextContour (GLUtesselator* tess, GLenum type);
-extern void gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
-extern void gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
-extern void gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
-extern void gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
-extern void gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
-extern void gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
-extern void gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
-extern void gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-extern void gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
-extern GLint gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
-extern void gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
-extern void gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
-extern void gluQuadricNormals (GLUquadric* quad, GLenum normal);
-extern void gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
-extern void gluQuadricTexture (GLUquadric* quad, GLboolean texture);
-extern GLint gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
-extern void gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
-extern void gluTessBeginContour (GLUtesselator* tess);
-extern void gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-extern void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluTessEndContour (GLUtesselator* tess);
-extern void gluTessEndPolygon (GLUtesselator* tess);
-extern void gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-extern void gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-extern void gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-extern GLint gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
-extern GLint gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble near, GLdouble far, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glu_h__ */
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile
index 9d43fb53f..4ef28f913 100644
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -38,7 +38,6 @@ HEADERS = \
Xproto.h \
Xprotostr.h \
Xthreads.h \
- ap_keysym.h \
keysym.h \
keysymdef.h \
$(AU_HEADERS) \
diff --git a/nx-X11/include/ap_keysym.h b/nx-X11/include/ap_keysym.h
deleted file mode 100644
index 9a1197117..000000000
--- a/nx-X11/include/ap_keysym.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************
-Copyright 1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
-Copyright 1989 by Hewlett-Packard Company.
-
- All Rights Reserved
-
-Permission to use, duplicate, change, and distribute this software and
-its documentation for any purpose and without fee is granted, provided
-that the above copyright notice appear in such copy and that this
-copyright notice appear in all supporting documentation, and that the
-names of Apollo Computer Inc., the Hewlett-Packard Company, or the X
-Consortium not be used in advertising or publicity pertaining to
-distribution of the software without written prior permission.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-This software is not subject to any license of the American
-Telephone and Telegraph Company or of the Regents of the
-University of California.
-******************************************************************/
-
-#define apXK_LineDel 0x1000FF00
-#define apXK_CharDel 0x1000FF01
-#define apXK_Copy 0x1000FF02
-#define apXK_Cut 0x1000FF03
-#define apXK_Paste 0x1000FF04
-#define apXK_Move 0x1000FF05
-#define apXK_Grow 0x1000FF06
-#define apXK_Cmd 0x1000FF07
-#define apXK_Shell 0x1000FF08
-#define apXK_LeftBar 0x1000FF09
-#define apXK_RightBar 0x1000FF0A
-#define apXK_LeftBox 0x1000FF0B
-#define apXK_RightBox 0x1000FF0C
-#define apXK_UpBox 0x1000FF0D
-#define apXK_DownBox 0x1000FF0E
-#define apXK_Pop 0x1000FF0F
-#define apXK_Read 0x1000FF10
-#define apXK_Edit 0x1000FF11
-#define apXK_Save 0x1000FF12
-#define apXK_Exit 0x1000FF13
-#define apXK_Repeat 0x1000FF14
-
-#define apXK_KP_parenleft 0x1000FFA8
-#define apXK_KP_parenright 0x1000FFA9
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index ad80e5299..f1760d274 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -8,8 +8,8 @@ SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h
#endif
#if BuildXvExt
-XVHEADERS = Xv.h Xvlib.h Xvproto.h
-XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
+XVHEADERS = Xv.h Xvproto.h
+XVMCHEADERS = XvMC.h XvMCproto.h
#endif
#if BuildXinerama
XINERAMAHEADERS = panoramiXext.h panoramiXproto.h
@@ -53,7 +53,7 @@ EXTRAHEADERS = \
HEADERS = \
xcmiscstr.h \
bigreqstr.h \
- XI.h XInput.h XIproto.h \
+ XI.h XIproto.h \
xtestconst.h xtestext1.h xteststr.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
Xdbeproto.h \
@@ -80,7 +80,4 @@ InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(vldXvMC.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
-InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
diff --git a/nx-X11/include/extensions/XInput.h b/nx-X11/include/extensions/XInput.h
deleted file mode 100644
index 4e36a208a..000000000
--- a/nx-X11/include/extensions/XInput.h
+++ /dev/null
@@ -1,1123 +0,0 @@
-
-/************************************************************
-
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-/* Definitions used by the library and client */
-
-#ifndef _XINPUT_H_
-#define _XINPUT_H_
-
-#include <nx-X11/Xlib.h>
-#include <nx-X11/extensions/XI.h>
-
-#define _deviceKeyPress 0
-#define _deviceKeyRelease 1
-
-#define _deviceButtonPress 0
-#define _deviceButtonRelease 1
-
-#define _deviceMotionNotify 0
-
-#define _deviceFocusIn 0
-#define _deviceFocusOut 1
-
-#define _proximityIn 0
-#define _proximityOut 1
-
-#define _deviceStateNotify 0
-#define _deviceMappingNotify 1
-#define _changeDeviceNotify 2
-
-#define FindTypeAndClass(d,type,_class,classid,offset) \
- { int _i; XInputClassInfo *_ip; \
- type = 0; _class = 0; \
- for (_i=0, _ip= ((XDevice *) d)->classes; \
- _i< ((XDevice *) d)->num_classes; \
- _i++, _ip++) \
- if (_ip->input_class == classid) \
- {type = _ip->event_type_base + offset; \
- _class = ((XDevice *) d)->device_id << 8 | type;}}
-
-#define DeviceKeyPress(d,type,_class) \
- FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyPress)
-
-#define DeviceKeyRelease(d,type,_class) \
- FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyRelease)
-
-#define DeviceButtonPress(d,type,_class) \
- FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonPress)
-
-#define DeviceButtonRelease(d,type,_class) \
- FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonRelease)
-
-#define DeviceMotionNotify(d,type,_class) \
- FindTypeAndClass(d, type, _class, ValuatorClass, _deviceMotionNotify)
-
-#define DeviceFocusIn(d,type,_class) \
- FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusIn)
-
-#define DeviceFocusOut(d,type,_class) \
- FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusOut)
-
-#define ProximityIn(d,type,_class) \
- FindTypeAndClass(d, type, _class, ProximityClass, _proximityIn)
-
-#define ProximityOut(d,type,_class) \
- FindTypeAndClass(d, type, _class, ProximityClass, _proximityOut)
-
-#define DeviceStateNotify(d,type,_class) \
- FindTypeAndClass(d, type, _class, OtherClass, _deviceStateNotify)
-
-#define DeviceMappingNotify(d,type,_class) \
- FindTypeAndClass(d, type, _class, OtherClass, _deviceMappingNotify)
-
-#define ChangeDeviceNotify(d,type,_class) \
- FindTypeAndClass(d, type, _class, OtherClass, _changeDeviceNotify)
-
-#define DevicePointerMotionHint(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _devicePointerMotionHint;}
-
-#define DeviceButton1Motion(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButton1Motion;}
-
-#define DeviceButton2Motion(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButton2Motion;}
-
-#define DeviceButton3Motion(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButton3Motion;}
-
-#define DeviceButton4Motion(d,type, _class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButton4Motion;}
-
-#define DeviceButton5Motion(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButton5Motion;}
-
-#define DeviceButtonMotion(d,type, _class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonMotion;}
-
-#define DeviceOwnerGrabButton(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceOwnerGrabButton;}
-
-#define DeviceButtonPressGrab(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonGrab;}
-
-#define NoExtensionEvent(d,type,_class) \
- { _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
-
-#define BadDevice(dpy,error) _xibaddevice(dpy, &error)
-
-#define BadClass(dpy,error) _xibadclass(dpy, &error)
-
-#define BadEvent(dpy,error) _xibadevent(dpy, &error)
-
-#define BadMode(dpy,error) _xibadmode(dpy, &error)
-
-#define DeviceBusy(dpy,error) _xidevicebusy(dpy, &error)
-
-/***************************************************************
- *
- * DeviceKey events. These events are sent by input devices that
- * support input class Keys.
- * The location of the X pointer is reported in the coordinate
- * fields of the x,y and x_root,y_root fields.
- *
- */
-
-typedef struct
- {
- int type; /* of event */
- unsigned long serial; /* # of last request processed */
- Bool send_event; /* true if from SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* "event" window reported relative to */
- XID deviceid;
- Window root; /* root window event occured on */
- Window subwindow; /* child window */
- Time time; /* milliseconds */
- int x, y; /* x, y coordinates in event window */
- int x_root; /* coordinates relative to root */
- int y_root; /* coordinates relative to root */
- unsigned int state; /* key or button mask */
- unsigned int keycode; /* detail */
- Bool same_screen; /* same screen flag */
- unsigned int device_state; /* device key or button mask */
- unsigned char axes_count;
- unsigned char first_axis;
- int axis_data[6];
- } XDeviceKeyEvent;
-
-typedef XDeviceKeyEvent XDeviceKeyPressedEvent;
-typedef XDeviceKeyEvent XDeviceKeyReleasedEvent;
-
-/*******************************************************************
- *
- * DeviceButton events. These events are sent by extension devices
- * that support input class Buttons.
- *
- */
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* "event" window reported relative to */
- XID deviceid;
- Window root; /* root window that the event occured on */
- Window subwindow; /* child window */
- Time time; /* milliseconds */
- int x, y; /* x, y coordinates in event window */
- int x_root; /* coordinates relative to root */
- int y_root; /* coordinates relative to root */
- unsigned int state; /* key or button mask */
- unsigned int button; /* detail */
- Bool same_screen; /* same screen flag */
- unsigned int device_state; /* device key or button mask */
- unsigned char axes_count;
- unsigned char first_axis;
- int axis_data[6];
- } XDeviceButtonEvent;
-
-typedef XDeviceButtonEvent XDeviceButtonPressedEvent;
-typedef XDeviceButtonEvent XDeviceButtonReleasedEvent;
-
-/*******************************************************************
- *
- * DeviceMotionNotify event. These events are sent by extension devices
- * that support input class Valuators.
- *
- */
-
-typedef struct
- {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* "event" window reported relative to */
- XID deviceid;
- Window root; /* root window that the event occured on */
- Window subwindow; /* child window */
- Time time; /* milliseconds */
- int x, y; /* x, y coordinates in event window */
- int x_root; /* coordinates relative to root */
- int y_root; /* coordinates relative to root */
- unsigned int state; /* key or button mask */
- char is_hint; /* detail */
- Bool same_screen; /* same screen flag */
- unsigned int device_state; /* device key or button mask */
- unsigned char axes_count;
- unsigned char first_axis;
- int axis_data[6];
- } XDeviceMotionEvent;
-
-/*******************************************************************
- *
- * DeviceFocusChange events. These events are sent when the focus
- * of an extension device that can be focused is changed.
- *
- */
-
-typedef struct
- {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* "event" window reported relative to */
- XID deviceid;
- int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */
- int detail;
- /*
- * NotifyAncestor, NotifyVirtual, NotifyInferior,
- * NotifyNonLinear,NotifyNonLinearVirtual, NotifyPointer,
- * NotifyPointerRoot, NotifyDetailNone
- */
- Time time;
- } XDeviceFocusChangeEvent;
-
-typedef XDeviceFocusChangeEvent XDeviceFocusInEvent;
-typedef XDeviceFocusChangeEvent XDeviceFocusOutEvent;
-
-/*******************************************************************
- *
- * ProximityNotify events. These events are sent by those absolute
- * positioning devices that are capable of generating proximity information.
- *
- */
-
-typedef struct
- {
- int type; /* ProximityIn or ProximityOut */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window;
- XID deviceid;
- Window root;
- Window subwindow;
- Time time;
- int x, y;
- int x_root, y_root;
- unsigned int state;
- Bool same_screen;
- unsigned int device_state; /* device key or button mask */
- unsigned char axes_count;
- unsigned char first_axis;
- int axis_data[6];
- } XProximityNotifyEvent;
-typedef XProximityNotifyEvent XProximityInEvent;
-typedef XProximityNotifyEvent XProximityOutEvent;
-
-/*******************************************************************
- *
- * DeviceStateNotify events are generated on EnterWindow and FocusIn
- * for those clients who have selected DeviceState.
- *
- */
-
-typedef struct
- {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- } XInputClass;
-
-typedef struct {
- int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window;
- XID deviceid;
- Time time;
- int num_classes;
- char data[64];
-} XDeviceStateNotifyEvent;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- unsigned char num_valuators;
- unsigned char mode;
- int valuators[6];
-} XValuatorStatus;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- short num_keys;
- char keys[32];
-} XKeyStatus;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- short num_buttons;
- char buttons[32];
-} XButtonStatus;
-
-/*******************************************************************
- *
- * DeviceMappingNotify event. This event is sent when the key mapping,
- * modifier mapping, or button mapping of an extension device is changed.
- *
- */
-
-typedef struct {
- int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* unused */
- XID deviceid;
- Time time;
- int request; /* one of MappingModifier, MappingKeyboard,
- MappingPointer */
- int first_keycode;/* first keycode */
- int count; /* defines range of change w. first_keycode*/
-} XDeviceMappingEvent;
-
-/*******************************************************************
- *
- * ChangeDeviceNotify event. This event is sent when an
- * XChangeKeyboard or XChangePointer request is made.
- *
- */
-
-typedef struct {
- int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* unused */
- XID deviceid;
- Time time;
- int request; /* NewPointer or NewKeyboard */
-} XChangeDeviceNotifyEvent;
-
-/*******************************************************************
- *
- * Control structures for input devices that support input class
- * Feedback. These are used by the XGetFeedbackControl and
- * XChangeFeedbackControl functions.
- *
- */
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
-} XFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int click;
- int percent;
- int pitch;
- int duration;
- int led_mask;
- int global_auto_repeat;
- char auto_repeats[32];
-} XKbdFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int accelNum;
- int accelDenom;
- int threshold;
-} XPtrFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int resolution;
- int minVal;
- int maxVal;
-} XIntegerFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int max_symbols;
- int num_syms_supported;
- KeySym *syms_supported;
-} XStringFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int percent;
- int pitch;
- int duration;
-} XBellFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int led_values;
- int led_mask;
-} XLedFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
-} XFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int accelNum;
- int accelDenom;
- int threshold;
-} XPtrFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int click;
- int percent;
- int pitch;
- int duration;
- int led_mask;
- int led_value;
- int key;
- int auto_repeat_mode;
-} XKbdFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int num_keysyms;
- KeySym *syms_to_display;
-} XStringFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int int_to_display;
-} XIntegerFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int percent;
- int pitch;
- int duration;
-} XBellFeedbackControl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- XID id;
- int led_mask;
- int led_values;
-} XLedFeedbackControl;
-
-/*******************************************************************
- *
- * Device control structures.
- *
- */
-
-typedef struct {
- XID control;
- int length;
-} XDeviceControl;
-
-typedef struct {
- XID control;
- int length;
- int first_valuator;
- int num_valuators;
- int *resolutions;
-} XDeviceResolutionControl;
-
-typedef struct {
- XID control;
- int length;
- int num_valuators;
- int *resolutions;
- int *min_resolutions;
- int *max_resolutions;
-} XDeviceResolutionState;
-
-/*******************************************************************
- *
- * An array of XDeviceList structures is returned by the
- * XListInputDevices function. Each entry contains information
- * about one input device. Among that information is an array of
- * pointers to structures that describe the characteristics of
- * the input device.
- *
- */
-
-typedef struct _XAnyClassinfo *XAnyClassPtr;
-
-typedef struct _XAnyClassinfo {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- } XAnyClassInfo;
-
-typedef struct _XDeviceInfo *XDeviceInfoPtr;
-
-typedef struct _XDeviceInfo
- {
- XID id;
- Atom type;
- char *name;
- int num_classes;
- int use;
- XAnyClassPtr inputclassinfo;
- } XDeviceInfo;
-
-typedef struct _XKeyInfo *XKeyInfoPtr;
-
-typedef struct _XKeyInfo
- {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- unsigned short min_keycode;
- unsigned short max_keycode;
- unsigned short num_keys;
- } XKeyInfo;
-
-typedef struct _XButtonInfo *XButtonInfoPtr;
-
-typedef struct _XButtonInfo {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- short num_buttons;
- } XButtonInfo;
-
-typedef struct _XAxisInfo *XAxisInfoPtr;
-
-typedef struct _XAxisInfo {
- int resolution;
- int min_value;
- int max_value;
- } XAxisInfo;
-
-typedef struct _XValuatorInfo *XValuatorInfoPtr;
-
-typedef struct _XValuatorInfo
- {
-#if defined(__cplusplus) || defined(c_plusplus)
- XID c_class;
-#else
- XID class;
-#endif
- int length;
- unsigned char num_axes;
- unsigned char mode;
- unsigned long motion_buffer;
- XAxisInfoPtr axes;
- } XValuatorInfo;
-
-
-/*******************************************************************
- *
- * An XDevice structure is returned by the XOpenDevice function.
- * It contains an array of pointers to XInputClassInfo structures.
- * Each contains information about a class of input supported by the
- * device, including a pointer to an array of data for each type of event
- * the device reports.
- *
- */
-
-
-typedef struct {
- unsigned char input_class;
- unsigned char event_type_base;
-} XInputClassInfo;
-
-typedef struct {
- XID device_id;
- int num_classes;
- XInputClassInfo *classes;
-} XDevice;
-
-
-/*******************************************************************
- *
- * The following structure is used to return information for the
- * XGetSelectedExtensionEvents function.
- *
- */
-
-typedef struct {
- XEventClass event_type;
- XID device;
-} XEventList;
-
-/*******************************************************************
- *
- * The following structure is used to return motion history data from
- * an input device that supports the input class Valuators.
- * This information is returned by the XGetDeviceMotionEvents function.
- *
- */
-
-typedef struct {
- Time time;
- int *data;
-} XDeviceTimeCoord;
-
-
-/*******************************************************************
- *
- * Device state structure.
- * This is returned by the XQueryDeviceState request.
- *
- */
-
-typedef struct {
- XID device_id;
- int num_classes;
- XInputClass *data;
-} XDeviceState;
-
-/*******************************************************************
- *
- * Note that the mode field is a bitfield that reports the Proximity
- * status of the device as well as the mode. The mode field should
- * be OR'd with the mask DeviceMode and compared with the values
- * Absolute and Relative to determine the mode, and should be OR'd
- * with the mask ProximityState and compared with the values InProximity
- * and OutOfProximity to determine the proximity state.
- *
- */
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- unsigned char num_valuators;
- unsigned char mode;
- int *valuators;
-} XValuatorState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- short num_keys;
- char keys[32];
-} XKeyState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
- unsigned char c_class;
-#else
- unsigned char class;
-#endif
- unsigned char length;
- short num_buttons;
- char buttons[32];
-} XButtonState;
-
-/*******************************************************************
- *
- * Function definitions.
- *
- */
-
-_XFUNCPROTOBEGIN
-
-extern int XChangeKeyboardDevice(
- Display* /* display */,
- XDevice* /* device */
-);
-
-extern int XChangePointerDevice(
- Display* /* display */,
- XDevice* /* device */,
- int /* xaxis */,
- int /* yaxis */
-);
-
-extern int XGrabDevice(
- Display* /* display */,
- XDevice* /* device */,
- Window /* grab_window */,
- Bool /* ownerEvents */,
- int /* event count */,
- XEventClass* /* event_list */,
- int /* this_device_mode */,
- int /* other_devices_mode */,
- Time /* time */
-);
-
-extern int XUngrabDevice(
- Display* /* display */,
- XDevice* /* device */,
- Time /* time */
-);
-
-extern int XGrabDeviceKey(
- Display* /* display */,
- XDevice* /* device */,
- unsigned int /* key */,
- unsigned int /* modifiers */,
- XDevice* /* modifier_device */,
- Window /* grab_window */,
- Bool /* owner_events */,
- unsigned int /* event_count */,
- XEventClass* /* event_list */,
- int /* this_device_mode */,
- int /* other_devices_mode */
-);
-
-extern int XUngrabDeviceKey(
- Display* /* display */,
- XDevice* /* device */,
- unsigned int /* key */,
- unsigned int /* modifiers */,
- XDevice* /* modifier_dev */,
- Window /* grab_window */
-);
-
-extern int XGrabDeviceButton(
- Display* /* display */,
- XDevice* /* device */,
- unsigned int /* button */,
- unsigned int /* modifiers */,
- XDevice* /* modifier_device */,
- Window /* grab_window */,
- Bool /* owner_events */,
- unsigned int /* event_count */,
- XEventClass* /* event_list */,
- int /* this_device_mode */,
- int /* other_devices_mode */
-);
-
-extern int XUngrabDeviceButton(
- Display* /* display */,
- XDevice* /* device */,
- unsigned int /* button */,
- unsigned int /* modifiers */,
- XDevice* /* modifier_dev */,
- Window /* grab_window */
-);
-
-extern int XAllowDeviceEvents(
- Display* /* display */,
- XDevice* /* device */,
- int /* event_mode */,
- Time /* time */
-);
-
-extern int XGetDeviceFocus(
- Display* /* display */,
- XDevice* /* device */,
- Window* /* focus */,
- int* /* revert_to */,
- Time* /* time */
-);
-
-extern int XSetDeviceFocus(
- Display* /* display */,
- XDevice* /* device */,
- Window /* focus */,
- int /* revert_to */,
- Time /* time */
-);
-
-extern XFeedbackState *XGetFeedbackControl(
- Display* /* display */,
- XDevice* /* device */,
- int* /* num_feedbacks */
-);
-
-extern void XFreeFeedbackList(
- XFeedbackState* /* list */
-);
-
-extern int XChangeFeedbackControl(
- Display* /* display */,
- XDevice* /* device */,
- unsigned long /* mask */,
- XFeedbackControl* /* f */
-);
-
-extern int XDeviceBell(
- Display* /* display */,
- XDevice* /* device */,
- XID /* feedbackclass */,
- XID /* feedbackid */,
- int /* percent */
-);
-
-extern KeySym *XGetDeviceKeyMapping(
- Display* /* display */,
- XDevice* /* device */,
-#if NeedWidePrototypes
- unsigned int /* first */,
-#else
- KeyCode /* first */,
-#endif
- int /* keycount */,
- int* /* syms_per_code */
-);
-
-extern int XChangeDeviceKeyMapping(
- Display* /* display */,
- XDevice* /* device */,
- int /* first */,
- int /* syms_per_code */,
- KeySym* /* keysyms */,
- int /* count */
-);
-
-extern XModifierKeymap *XGetDeviceModifierMapping(
- Display* /* display */,
- XDevice* /* device */
-);
-
-extern int XSetDeviceModifierMapping(
- Display* /* display */,
- XDevice* /* device */,
- XModifierKeymap* /* modmap */
-);
-
-extern int XSetDeviceButtonMapping(
- Display* /* display */,
- XDevice* /* device */,
- unsigned char* /* map[] */,
- int /* nmap */
-);
-
-extern int XGetDeviceButtonMapping(
- Display* /* display */,
- XDevice* /* device */,
- unsigned char* /* map[] */,
- unsigned int /* nmap */
-);
-
-extern XDeviceState *XQueryDeviceState(
- Display* /* display */,
- XDevice* /* device */
-);
-
-extern void XFreeDeviceState(
- XDeviceState* /* list */
-);
-
-extern XExtensionVersion *XGetExtensionVersion(
- Display* /* display */,
- _Xconst char* /* name */
-);
-
-extern XDeviceInfo *XListInputDevices(
- Display* /* display */,
- int* /* ndevices */
-);
-
-extern void XFreeDeviceList(
- XDeviceInfo* /* list */
-);
-
-extern XDevice *XOpenDevice(
- Display* /* display */,
- XID /* id */
-);
-
-extern int XCloseDevice(
- Display* /* display */,
- XDevice* /* device */
-);
-
-extern int XSetDeviceMode(
- Display* /* display */,
- XDevice* /* device */,
- int /* mode */
-);
-
-extern int XSetDeviceValuators(
- Display* /* display */,
- XDevice* /* device */,
- int* /* valuators */,
- int /* first_valuator */,
- int /* num_valuators */
-);
-
-extern XDeviceControl *XGetDeviceControl(
- Display* /* display */,
- XDevice* /* device */,
- int /* control */
-);
-
-extern int XChangeDeviceControl(
- Display* /* display */,
- XDevice* /* device */,
- int /* control */,
- XDeviceControl* /* d */
-);
-
-extern int XSelectExtensionEvent(
- Display* /* display */,
- Window /* w */,
- XEventClass* /* event_list */,
- int /* count */
-);
-
-extern int XGetSelectedExtensionEvents(
- Display* /* display */,
- Window /* w */,
- int* /* this_client_count */,
- XEventClass** /* this_client_list */,
- int* /* all_clients_count */,
- XEventClass** /* all_clients_list */
-);
-
-extern int XChangeDeviceDontPropagateList(
- Display* /* display */,
- Window /* window */,
- int /* count */,
- XEventClass* /* events */,
- int /* mode */
-);
-
-extern XEventClass *XGetDeviceDontPropagateList(
- Display* /* display */,
- Window /* window */,
- int* /* count */
-);
-
-extern Status XSendExtensionEvent(
- Display* /* display */,
- XDevice* /* device */,
- Window /* dest */,
- Bool /* prop */,
- int /* count */,
- XEventClass* /* list */,
- XEvent* /* event */
-);
-
-extern XDeviceTimeCoord *XGetDeviceMotionEvents(
- Display* /* display */,
- XDevice* /* device */,
- Time /* start */,
- Time /* stop */,
- int* /* nEvents */,
- int* /* mode */,
- int* /* axis_count */
-);
-
-extern void XFreeDeviceMotionEvents(
- XDeviceTimeCoord* /* events */
-);
-
-extern void XFreeDeviceControl(
- XDeviceControl* /* control */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XINPUT_H_ */
diff --git a/nx-X11/include/extensions/XvMClib.h b/nx-X11/include/extensions/XvMClib.h
deleted file mode 100644
index cb5406475..000000000
--- a/nx-X11/include/extensions/XvMClib.h
+++ /dev/null
@@ -1,215 +0,0 @@
-
-#ifndef _XVMCLIB_H_
-#define _XVMCLIB_H_
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/extensions/Xvlib.h>
-#include <nx-X11/extensions/XvMC.h>
-
-_XFUNCPROTOBEGIN
-
-Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
-Status XvMCQueryVersion (Display *display, int *major_versionp,
- int *minor_versionp);
-Status XvMCGetDRInfo(Display *dpy, XvPortID port,
- char **name, char **busID,
- int *major, int *minor,
- int *patchLevel,
- int *isLocal);
-
-
-XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);
-
-Status XvMCCreateContext (
- Display *display,
- XvPortID port,
- int surface_type_id,
- int width,
- int height,
- int flags,
- XvMCContext * context
-);
-
-Status XvMCDestroyContext (Display *display, XvMCContext * context);
-
-Status
-XvMCCreateSurface(
- Display *display,
- XvMCContext * context,
- XvMCSurface * surface
-);
-
-Status XvMCDestroySurface(Display *display, XvMCSurface *surface);
-
-XvImageFormatValues * XvMCListSubpictureTypes (
- Display * display,
- XvPortID port,
- int surface_type_id,
- int *count_return
-);
-
-Status
-XvMCPutSurface(
- Display *display,
- XvMCSurface *surface,
- Drawable draw,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth,
- int flags
-);
-
-Status XvMCHideSurface(Display *display, XvMCSurface *surface);
-
-Status
-XvMCCreateSubpicture (
- Display *display,
- XvMCContext *context,
- XvMCSubpicture *subpicture,
- unsigned short width,
- unsigned short height,
- int xvimage_id
-);
-
-
-Status
-XvMCClearSubpicture (
- Display *display,
- XvMCSubpicture *subpicture,
- short x,
- short y,
- unsigned short width,
- unsigned short height,
- unsigned int color
-);
-
-Status
-XvMCCompositeSubpicture (
- Display *display,
- XvMCSubpicture *subpicture,
- XvImage *image,
- short srcx,
- short srcy,
- unsigned short width,
- unsigned short height,
- short dstx,
- short dsty
-);
-
-Status
-XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture);
-
-Status
-XvMCSetSubpicturePalette (
- Display *display,
- XvMCSubpicture *subpicture,
- unsigned char *palette
-);
-
-Status
-XvMCBlendSubpicture (
- Display *display,
- XvMCSurface *target_surface,
- XvMCSubpicture *subpicture,
- short subx,
- short suby,
- unsigned short subw,
- unsigned short subh,
- short surfx,
- short surfy,
- unsigned short surfw,
- unsigned short surfh
-);
-
-Status
-XvMCBlendSubpicture2 (
- Display *display,
- XvMCSurface *source_surface,
- XvMCSurface *target_surface,
- XvMCSubpicture *subpicture,
- short subx,
- short suby,
- unsigned short subw,
- unsigned short subh,
- short surfx,
- short surfy,
- unsigned short surfw,
- unsigned short surfh
-);
-
-Status XvMCSyncSurface (Display *display, XvMCSurface *surface);
-Status XvMCFlushSurface (Display *display, XvMCSurface *surface);
-Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat);
-
-Status XvMCRenderSurface (
- Display *display,
- XvMCContext *context,
- unsigned int picture_structure,
- XvMCSurface *target_surface,
- XvMCSurface *past_surface,
- XvMCSurface *future_surface,
- unsigned int flags,
- unsigned int num_macroblocks,
- unsigned int first_macroblock,
- XvMCMacroBlockArray *macroblock_array,
- XvMCBlockArray *blocks
-);
-
-
-Status XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture);
-Status XvMCFlushSubpicture (Display *display, XvMCSubpicture *subpicture);
-Status
-XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat);
-
-Status XvMCCreateBlocks (
- Display *display,
- XvMCContext *context,
- unsigned int num_blocks,
- XvMCBlockArray *block
-);
-
-Status XvMCDestroyBlocks (Display *display,XvMCBlockArray *block);
-
-Status XvMCCreateMacroBlocks (
- Display *display,
- XvMCContext *context,
- unsigned int num_blocks,
- XvMCMacroBlockArray *blocks
-);
-
-Status XvMCDestroyMacroBlocks (
- Display *display,
- XvMCMacroBlockArray *block
-);
-
-XvAttribute *
-XvMCQueryAttributes (
- Display *display,
- XvMCContext *context,
- int *number
-);
-
-Status
-XvMCSetAttribute (
- Display *display,
- XvMCContext *context,
- Atom attribute,
- int value
-);
-
-Status
-XvMCGetAttribute (
- Display *display,
- XvMCContext *context,
- Atom attribute,
- int *value
-);
-
-_XFUNCPROTOEND
-
-#endif
diff --git a/nx-X11/include/extensions/Xvlib.h b/nx-X11/include/extensions/Xvlib.h
deleted file mode 100644
index eb6ebd825..000000000
--- a/nx-X11/include/extensions/Xvlib.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/***********************************************************
-Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or MIT not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef XVLIB_H
-#define XVLIB_H
-/*
-** File:
-**
-** Xvlib.h --- Xv library public header file
-**
-** Author:
-**
-** David Carver (Digital Workstation Engineering/Project Athena)
-**
-** Revisions:
-**
-** 26.06.91 Carver
-** - changed XvFreeAdaptors to XvFreeAdaptorInfo
-** - changed XvFreeEncodings to XvFreeEncodingInfo
-**
-** 11.06.91 Carver
-** - changed SetPortControl to SetPortAttribute
-** - changed GetPortControl to GetPortAttribute
-** - changed QueryBestSize
-**
-** 05.15.91 Carver
-** - version 2.0 upgrade
-**
-** 01.24.91 Carver
-** - version 1.4 upgrade
-**
-*/
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/extensions/Xv.h>
-
-typedef struct {
- int numerator;
- int denominator;
-} XvRational;
-
-typedef struct {
- int flags; /* XvGettable, XvSettable */
- int min_value;
- int max_value;
- char *name;
-} XvAttribute;
-
-typedef struct {
- XvEncodingID encoding_id;
- char *name;
- unsigned long width;
- unsigned long height;
- XvRational rate;
- unsigned long num_encodings;
-} XvEncodingInfo;
-
-typedef struct {
- char depth;
- unsigned long visual_id;
-} XvFormat;
-
-typedef struct {
- XvPortID base_id;
- unsigned long num_ports;
- char type;
- char *name;
- unsigned long num_formats;
- XvFormat *formats;
- unsigned long num_adaptors;
-} XvAdaptorInfo;
-
-typedef struct {
- int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Drawable drawable; /* drawable */
- unsigned long reason; /* what generated this event */
- XvPortID port_id; /* what port */
- Time time; /* milliseconds */
-} XvVideoNotifyEvent;
-
-typedef struct {
- int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- XvPortID port_id; /* what port */
- Time time; /* milliseconds */
- Atom attribute; /* atom that identifies attribute */
- long value; /* value of attribute */
-} XvPortNotifyEvent;
-
-typedef union {
- int type;
- XvVideoNotifyEvent xvvideo;
- XvPortNotifyEvent xvport;
- long pad[24];
-} XvEvent;
-
-typedef struct {
- int id; /* Unique descriptor for the format */
- int type; /* XvRGB, XvYUV */
- int byte_order; /* LSBFirst, MSBFirst */
- char guid[16]; /* Globally Unique IDentifier */
- int bits_per_pixel;
- int format; /* XvPacked, XvPlanar */
- int num_planes;
-
- /* for RGB formats only */
- int depth;
- unsigned int red_mask;
- unsigned int green_mask;
- unsigned int blue_mask;
-
- /* for YUV formats only */
- unsigned int y_sample_bits;
- unsigned int u_sample_bits;
- unsigned int v_sample_bits;
- unsigned int horz_y_period;
- unsigned int horz_u_period;
- unsigned int horz_v_period;
- unsigned int vert_y_period;
- unsigned int vert_u_period;
- unsigned int vert_v_period;
- char component_order[32]; /* eg. UYVY */
- int scanline_order; /* XvTopToBottom, XvBottomToTop */
-} XvImageFormatValues;
-
-typedef struct {
- int id;
- int width, height;
- int data_size; /* bytes */
- int num_planes;
- int *pitches; /* bytes */
- int *offsets; /* bytes */
- char *data;
- XPointer obdata;
-} XvImage;
-
-_XFUNCPROTOBEGIN
-
-extern int XvQueryExtension(
- Display* /* display */,
- unsigned int* /* p_version */,
- unsigned int* /* p_revision */,
- unsigned int* /* p_requestBase */,
- unsigned int* /* p_eventBase */,
- unsigned int* /* p_errorBase */
-);
-
-extern int XvQueryAdaptors(
- Display* /* display */,
- Window /* window */,
- unsigned int* /* p_nAdaptors */,
- XvAdaptorInfo** /* p_pAdaptors */
-);
-
-extern int XvQueryEncodings(
- Display* /* display */,
- XvPortID /* port */,
- unsigned int* /* p_nEncoding */,
- XvEncodingInfo** /* p_pEncoding */
-);
-
-extern int XvPutVideo(
- Display* /* display */,
- XvPortID /* port */,
- Drawable /* d */,
- GC /* gc */,
- int /* vx */,
- int /* vy */,
- unsigned int /* vw */,
- unsigned int /* vh */,
- int /* dx */,
- int /* dy */,
- unsigned int /* dw */,
- unsigned int /* dh */
-);
-
-extern int XvPutStill(
- Display* /* display */,
- XvPortID /* port */,
- Drawable /* d */,
- GC /* gc */,
- int /* vx */,
- int /* vy */,
- unsigned int /* vw */,
- unsigned int /* vh */,
- int /* dx */,
- int /* dy */,
- unsigned int /* dw */,
- unsigned int /* dh */
-);
-
-extern int XvGetVideo(
- Display* /* display */,
- XvPortID /* port */,
- Drawable /* d */,
- GC /* gc */,
- int /* vx */,
- int /* vy */,
- unsigned int /* vw */,
- unsigned int /* vh */,
- int /* dx */,
- int /* dy */,
- unsigned int /* dw */,
- unsigned int /* dh */
-);
-
-extern int XvGetStill(
- Display* /* display */,
- XvPortID /* port */,
- Drawable /* d */,
- GC /* gc */,
- int /* vx */,
- int /* vy */,
- unsigned int /* vw */,
- unsigned int /* vh */,
- int /* dx */,
- int /* dy */,
- unsigned int /* dw */,
- unsigned int /* dh */
-);
-
-extern int XvStopVideo(
- Display* /* display */,
- XvPortID /* port */,
- Drawable /* drawable */
-);
-
-extern int XvGrabPort(
- Display* /* display */,
- XvPortID /* port */,
- Time /* time */
-);
-
-extern int XvUngrabPort(
- Display* /* display */,
- XvPortID /* port */,
- Time /* time */
-);
-
-extern int XvSelectVideoNotify(
- Display* /* display */,
- Drawable /* drawable */,
- Bool /* onoff */
-);
-
-extern int XvSelectPortNotify(
- Display* /* display */,
- XvPortID /* port */,
- Bool /* onoff */
-);
-
-extern int XvSetPortAttribute(
- Display* /* display */,
- XvPortID /* port */,
- Atom /* attribute */,
- int /* value */
-);
-
-extern int XvGetPortAttribute(
- Display* /* display */,
- XvPortID /* port */,
- Atom /* attribute */,
- int* /* p_value */
-);
-
-extern int XvQueryBestSize(
- Display* /* display */,
- XvPortID /* port */,
- Bool /* motion */,
- unsigned int /* vid_w */,
- unsigned int /* vid_h */,
- unsigned int /* drw_w */,
- unsigned int /* drw_h */,
- unsigned int* /* p_actual_width */,
- unsigned int* /* p_actual_width */
-);
-
-extern XvAttribute* XvQueryPortAttributes(
- Display* /* display */,
- XvPortID /* port */,
- int* /* number */
-);
-
-
-extern void XvFreeAdaptorInfo(
- XvAdaptorInfo* /* adaptors */
-);
-
-extern void XvFreeEncodingInfo(
- XvEncodingInfo* /* encodings */
-);
-
-
-extern XvImageFormatValues * XvListImageFormats (
- Display *display,
- XvPortID port_id,
- int *count_return
-);
-
-extern XvImage * XvCreateImage (
- Display *display,
- XvPortID port,
- int id,
- char *data,
- int width,
- int height
-);
-
-extern int XvPutImage (
- Display *display,
- XvPortID id,
- Drawable d,
- GC gc,
- XvImage *image,
- int src_x,
- int src_y,
- unsigned int src_w,
- unsigned int src_h,
- int dest_x,
- int dest_y,
- unsigned int dest_w,
- unsigned int dest_h
-);
-
-extern int XvShmPutImage (
- Display *display,
- XvPortID id,
- Drawable d,
- GC gc,
- XvImage *image,
- int src_x,
- int src_y,
- unsigned int src_w,
- unsigned int src_h,
- int dest_x,
- int dest_y,
- unsigned int dest_w,
- unsigned int dest_h,
- Bool send_event
-);
-
-#ifdef _XSHM_H_
-
-extern XvImage * XvShmCreateImage (
- Display *display,
- XvPortID port,
- int id,
- char* data,
- int width,
- int height,
- XShmSegmentInfo *shminfo
-);
-
-#endif
-
-
-_XFUNCPROTOEND
-
-#endif /* XVLIB_H */
diff --git a/nx-X11/include/extensions/vldXvMC.h b/nx-X11/include/extensions/vldXvMC.h
deleted file mode 100644
index 355c662e6..000000000
--- a/nx-X11/include/extensions/vldXvMC.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*****************************************************************************
- * VLD XvMC Nonstandard extension API.
- *
- * Copyright (c) 2004 The Unichrome Project. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Thomas Hellström, 2004.
- */
-
-
-#ifndef _VLDXVMC_H
-#define _VLDXVMC_H
-
-#include <nx-X11/Xlib.h>
-#include <nx-X11/extensions/XvMC.h>
-#include <nx-X11/extensions/XvMClib.h>
-
-/*
- * New "Motion compensation type".
- */
-
-#define XVMC_VLD 0x0020000
-
-/*
- * Below Flags to be passed in the XvMCMpegControl structure 'flag' field.
- */
-
-#define XVMC_PROGRESSIVE_SEQUENCE 0x00000010
-
-/*
- * Zig-Zag Scan / Alternative Scan.
- */
-
-#define XVMC_ZIG_ZAG_SCAN 0x00000000
-#define XVMC_ALTERNATE_SCAN 0x00000100
-
-/*
- * Frame DCT and frame prediction are used. /
- * Field prediction
- */
-
-#define XVMC_PRED_DCT_FRAME 0x00000040
-#define XVMC_PRED_DCT_FIELD 0x00000000
-
-/*
- * Top / Bottom field first
- */
-
-#define XVMC_TOP_FIELD_FIRST 0x00000080
-#define XVMC_BOTTOM_FIELD_FIRST 0x00000000
-
-/*
- * Motion vectors coded in intra macroblocks
- */
-
-#define XVMC_CONCEALMENT_MOTION_VECTORS 0x00000200
-
-/*
- * Which of two mappings between quantiser_scale_code
- * and quantiser_scale shall apply.
- */
-
-#define XVMC_Q_SCALE_TYPE 0x00000400
-
-/*
- * Intra VLC Format: Bit = 0, Bit = 1
- * Intra blocks B-14 B-15
- * Non-intra blocks B-14 B-14
- */
-#define XVMC_INTRA_VLC_FORMAT 0x00000800
-
-/*
- * Also XVMC_SECOND_FIELD should be set in flags if active.
- */
-
-#define XVMC_I_PICTURE 1
-#define XVMC_P_PICTURE 2
-#define XVMC_B_PICTURE 3
-
-typedef struct _XvMCMpegControl{
- unsigned
- BVMV_range, /* Backward vertical motion vector range */
- BHMV_range, /* Backward horizontal motion vector range */
- FVMV_range, /* Forward vertical motion vector range */
- FHMV_range, /* Forward horizontal motion vector range */
- picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD,
- * XVMC_FRAME_PICTURE
- */
- intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
- picture_coding_type,/* XVMC_X_PICTURE */
- mpeg_coding, /* XVMC_MPEG_2 */
- flags; /* See above */
-}XvMCMpegControl;
-
-
-/*
- * The following function is called BEFORE starting sending slices to the
- * lib. It grabs the decoder hardware and prepares it for coming slices.
- * The function XvMCSyncSurface will release the hardware for other contexts
- * in addition to it's current functionality.
- */
-
-extern Status XvMCBeginSurface(Display *display,
- XvMCContext *context,
- XvMCSurface *target_surface,
- XvMCSurface *past_surface,
- XvMCSurface *future_surface,
- const XvMCMpegControl *control);
-
-
-/*
- * The quantizer matrix structure. This should be filled in by the user and
- * uploaded whenever a change is needed. The lib initializes with
- * default matrices and will automatically load the hardware with new matrices
- * on decoder context switches. To load data, set the corresponding load flag
- * to true and fill in the values. The VIA MPEG2 engine only uses the
- * intra_quantiser_matrix and the non_intra_quantiser_matrix.
- */
-
-typedef struct _XvMCQMatrix {
- int load_intra_quantiser_matrix;
- int load_non_intra_quantiser_matrix;
- int load_chroma_intra_quantiser_matrix;
- int load_chroma_non_intra_quantiser_matrix;
- unsigned char intra_quantiser_matrix[64];
- unsigned char non_intra_quantiser_matrix[64];
- unsigned char chroma_intra_quantiser_matrix[64];
- unsigned char chroma_non_intra_quantiser_matrix[64];
-} XvMCQMatrix;
-
-/*
- * Upload a XvMCQMatrix structure to the clientlib.
- * The hardware will start using it the next XvMCBeginSurface.
- */
-
-extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context,
- const XvMCQMatrix *qmx);
-
-
-/*
- * Put a slice to the decoder. The hardware will start processing it
- * immediately.
- */
-
-extern Status XvMCPutSlice(Display *display,XvMCContext *context,
- char *slice, int nBytes);
-/*
- * Put a slice without the slice start code to the decoder.
- * The hardware will start processing it
- * immediately. This function is for client optimization.
- * XvMCPutSlice(display,context,slice,nBytes) is equivalent to
- * XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]);
- */
-
-extern Status XvMCPutSlice2(Display *display,XvMCContext *context,
- char *slice, int nBytes, int sliceCode);
-
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:29:45 +0000