From d3d698ab760db96088d8a0e19799b0d18a44c201 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 16:30:56 +1000 Subject: Remove Xlib headers from xf86dga.h and xf86dga1.h Renamed to *const.h for consistency with other modules. Xlib headers moved to libXxf86dga. Signed-off-by: Peter Hutterer --- Makefile.am | 4 +- xf86dga.h | 263 -------------------------------------------------------- xf86dga1.h | 139 ------------------------------ xf86dga1const.h | 36 ++++++++ xf86dgaconst.h | 96 +++++++++++++++++++++ 5 files changed, 134 insertions(+), 404 deletions(-) delete mode 100644 xf86dga.h delete mode 100644 xf86dga1.h create mode 100644 xf86dga1const.h create mode 100644 xf86dgaconst.h diff --git a/Makefile.am b/Makefile.am index 9ff15bb..9c0f66f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ xf86dgadir = $(includedir)/X11/extensions xf86dga_HEADERS = \ - xf86dga1.h \ + xf86dga1const.h \ xf86dga1str.h \ - xf86dga.h \ + xf86dgaconst.h \ xf86dgastr.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/xf86dga.h b/xf86dga.h deleted file mode 100644 index fed69c3..0000000 --- a/xf86dga.h +++ /dev/null @@ -1,263 +0,0 @@ -/* - Copyright (c) 1999 XFree86 Inc -*/ - -#ifndef _XF86DGA_H_ -#define _XF86DGA_H_ - -#include -#include - -#define X_XDGAQueryVersion 0 - -/* 1 through 9 are in xf86dga1.h */ - -/* 10 and 11 are reserved to avoid conflicts with rogue DGA extensions */ - -#define X_XDGAQueryModes 12 -#define X_XDGASetMode 13 -#define X_XDGASetViewport 14 -#define X_XDGAInstallColormap 15 -#define X_XDGASelectInput 16 -#define X_XDGAFillRectangle 17 -#define X_XDGACopyArea 18 -#define X_XDGACopyTransparentArea 19 -#define X_XDGAGetViewportStatus 20 -#define X_XDGASync 21 -#define X_XDGAOpenFramebuffer 22 -#define X_XDGACloseFramebuffer 23 -#define X_XDGASetClientVersion 24 -#define X_XDGAChangePixmapMode 25 -#define X_XDGACreateColormap 26 - - -#define XDGAConcurrentAccess 0x00000001 -#define XDGASolidFillRect 0x00000002 -#define XDGABlitRect 0x00000004 -#define XDGABlitTransRect 0x00000008 -#define XDGAPixmap 0x00000010 - -#define XDGAInterlaced 0x00010000 -#define XDGADoublescan 0x00020000 - -#define XDGAFlipImmediate 0x00000001 -#define XDGAFlipRetrace 0x00000002 - -#define XDGANeedRoot 0x00000001 - -#define XF86DGANumberEvents 7 - -#define XDGAPixmapModeLarge 0 -#define XDGAPixmapModeSmall 1 - -#define XF86DGAClientNotLocal 0 -#define XF86DGANoDirectVideoMode 1 -#define XF86DGAScreenNotActive 2 -#define XF86DGADirectNotActivated 3 -#define XF86DGAOperationNotSupported 4 -#define XF86DGANumberErrors (XF86DGAOperationNotSupported + 1) - - -typedef struct { - int num; /* A unique identifier for the mode (num > 0) */ - char *name; /* name of mode given in the XF86Config */ - float verticalRefresh; - int flags; /* DGA_CONCURRENT_ACCESS, etc... */ - int imageWidth; /* linear accessible portion (pixels) */ - int imageHeight; - int pixmapWidth; /* Xlib accessible portion (pixels) */ - int pixmapHeight; /* both fields ignored if no concurrent access */ - int bytesPerScanline; - int byteOrder; /* MSBFirst, LSBFirst */ - int depth; - int bitsPerPixel; - unsigned long redMask; - unsigned long greenMask; - unsigned long blueMask; - short visualClass; - int viewportWidth; - int viewportHeight; - int xViewportStep; /* viewport position granularity */ - int yViewportStep; - int maxViewportX; /* max viewport origin */ - int maxViewportY; - int viewportFlags; /* types of page flipping possible */ - int reserved1; - int reserved2; -} XDGAMode; - - -typedef struct { - XDGAMode mode; - unsigned char *data; - Pixmap pixmap; -} XDGADevice; - - -#ifndef _XF86DGA_SERVER_ -_XFUNCPROTOBEGIN - -typedef struct { - int type; - unsigned long serial; - Display *display; - int screen; - Time time; - unsigned int state; - unsigned int button; -} XDGAButtonEvent; - -typedef struct { - int type; - unsigned long serial; - Display *display; - int screen; - Time time; - unsigned int state; - unsigned int keycode; -} XDGAKeyEvent; - -typedef struct { - int type; - unsigned long serial; - Display *display; - int screen; - Time time; - unsigned int state; - int dx; - int dy; -} XDGAMotionEvent; - -typedef union { - int type; - XDGAButtonEvent xbutton; - XDGAKeyEvent xkey; - XDGAMotionEvent xmotion; - long pad[24]; -} XDGAEvent; - -Bool XDGAQueryExtension( - Display *dpy, - int *eventBase, - int *erroBase -); - -Bool XDGAQueryVersion( - Display *dpy, - int *majorVersion, - int *minorVersion -); - -XDGAMode* XDGAQueryModes( - Display *dpy, - int screen, - int *num -); - -XDGADevice* XDGASetMode( - Display *dpy, - int screen, - int mode -); - -Bool XDGAOpenFramebuffer( - Display *dpy, - int screen -); - -void XDGACloseFramebuffer( - Display *dpy, - int screen -); - -void XDGASetViewport( - Display *dpy, - int screen, - int x, - int y, - int flags -); - -void XDGAInstallColormap( - Display *dpy, - int screen, - Colormap cmap -); - -Colormap XDGACreateColormap( - Display *dpy, - int screen, - XDGADevice *device, - int alloc -); - -void XDGASelectInput( - Display *dpy, - int screen, - long event_mask -); - -void XDGAFillRectangle( - Display *dpy, - int screen, - int x, - int y, - unsigned int width, - unsigned int height, - unsigned long color -); - - -void XDGACopyArea( - Display *dpy, - int screen, - int srcx, - int srcy, - unsigned int width, - unsigned int height, - int dstx, - int dsty -); - - -void XDGACopyTransparentArea( - Display *dpy, - int screen, - int srcx, - int srcy, - unsigned int width, - unsigned int height, - int dstx, - int dsty, - unsigned long key -); - -int XDGAGetViewportStatus( - Display *dpy, - int screen -); - -void XDGASync( - Display *dpy, - int screen -); - -Bool XDGASetClientVersion( - Display *dpy -); - -void XDGAChangePixmapMode( - Display *dpy, - int screen, - int *x, - int *y, - int mode -); - - -void XDGAKeyEventToXKeyEvent(XDGAKeyEvent* dk, XKeyEvent* xk); - - -_XFUNCPROTOEND -#endif /* _XF86DGA_SERVER_ */ -#endif /* _XF86DGA_H_ */ diff --git a/xf86dga1.h b/xf86dga1.h deleted file mode 100644 index c18746e..0000000 --- a/xf86dga1.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - -Copyright (c) 1995 Jon Tombs -Copyright (c) 1995 XFree86 Inc - -*/ - -/************************************************************************ - - THIS IS THE OLD DGA API AND IS OBSOLETE. PLEASE DO NOT USE IT ANYMORE - -************************************************************************/ - -#ifndef _XF86DGA1_H_ -#define _XF86DGA1_H_ - -#include - -#define X_XF86DGAQueryVersion 0 -#define X_XF86DGAGetVideoLL 1 -#define X_XF86DGADirectVideo 2 -#define X_XF86DGAGetViewPortSize 3 -#define X_XF86DGASetViewPort 4 -#define X_XF86DGAGetVidPage 5 -#define X_XF86DGASetVidPage 6 -#define X_XF86DGAInstallColormap 7 -#define X_XF86DGAQueryDirectVideo 8 -#define X_XF86DGAViewPortChanged 9 - -#define XF86DGADirectPresent 0x0001 -#define XF86DGADirectGraphics 0x0002 -#define XF86DGADirectMouse 0x0004 -#define XF86DGADirectKeyb 0x0008 -#define XF86DGAHasColormap 0x0100 -#define XF86DGADirectColormap 0x0200 - - - - -#ifndef _XF86DGA_SERVER_ - -_XFUNCPROTOBEGIN - -Bool XF86DGAQueryVersion( - Display* /* dpy */, - int* /* majorVersion */, - int* /* minorVersion */ -); - -Bool XF86DGAQueryExtension( - Display* /* dpy */, - int* /* event_base */, - int* /* error_base */ -); - -Status XF86DGAGetVideoLL( - Display* /* dpy */, - int /* screen */, - unsigned int * /* base addr */, - int * /* width */, - int * /* bank_size */, - int * /* ram_size */ -); - -Status XF86DGAGetVideo( - Display* /* dpy */, - int /* screen */, - char ** /* base addr */, - int * /* width */, - int * /* bank_size */, - int * /* ram_size */ -); - -Status XF86DGADirectVideo( - Display* /* dpy */, - int /* screen */, - int /* enable */ -); - -Status XF86DGADirectVideoLL( - Display* /* dpy */, - int /* screen */, - int /* enable */ -); - -Status XF86DGAGetViewPortSize( - Display* /* dpy */, - int /* screen */, - int * /* width */, - int * /* height */ -); - -Status XF86DGASetViewPort( - Display* /* dpy */, - int /* screen */, - int x /* X */, - int y /* Y */ -); - -Status XF86DGAGetVidPage( - Display* /* dpy */, - int /* screen */, - int * /* vid page */ -); - -Status XF86DGASetVidPage( - Display* /* dpy */, - int /* screen */, - int /* vid page */ -); - -Status XF86DGAInstallColormap( - Display* /* dpy */, - int /* screen */, - Colormap /*Colormap */ -); - -int XF86DGAForkApp( - int screen -); - -Status XF86DGAQueryDirectVideo( - Display * /* dpy */, - int /* screen */, - int * /* flags */ -); - -Bool XF86DGAViewPortChanged( - Display * /* dpy */, - int /* screen */, - int /* n */ -); - - -_XFUNCPROTOEND - -#endif /* _XF86DGA_SERVER_ */ - -#endif /* _XF86DGA1_H_ */ diff --git a/xf86dga1const.h b/xf86dga1const.h new file mode 100644 index 0000000..eca06f6 --- /dev/null +++ b/xf86dga1const.h @@ -0,0 +1,36 @@ +/* + +Copyright (c) 1995 Jon Tombs +Copyright (c) 1995 XFree86 Inc + +*/ + +/************************************************************************ + + THIS IS THE OLD DGA API AND IS OBSOLETE. PLEASE DO NOT USE IT ANYMORE + +************************************************************************/ + +#ifndef _XF86DGA1CONST_H_ +#define _XF86DGA1CONST_H_ + +#define X_XF86DGAQueryVersion 0 +#define X_XF86DGAGetVideoLL 1 +#define X_XF86DGADirectVideo 2 +#define X_XF86DGAGetViewPortSize 3 +#define X_XF86DGASetViewPort 4 +#define X_XF86DGAGetVidPage 5 +#define X_XF86DGASetVidPage 6 +#define X_XF86DGAInstallColormap 7 +#define X_XF86DGAQueryDirectVideo 8 +#define X_XF86DGAViewPortChanged 9 + +#define XF86DGADirectPresent 0x0001 +#define XF86DGADirectGraphics 0x0002 +#define XF86DGADirectMouse 0x0004 +#define XF86DGADirectKeyb 0x0008 +#define XF86DGAHasColormap 0x0100 +#define XF86DGADirectColormap 0x0200 + + +#endif /* _XF86DGA1CONST_H_ */ diff --git a/xf86dgaconst.h b/xf86dgaconst.h new file mode 100644 index 0000000..63829bc --- /dev/null +++ b/xf86dgaconst.h @@ -0,0 +1,96 @@ +/* + Copyright (c) 1999 XFree86 Inc +*/ + +#ifndef _XF86DGACONST_H_ +#define _XF86DGACONST_H_ + +#include + +#define X_XDGAQueryVersion 0 + +/* 1 through 9 are in xf86dga1.h */ + +/* 10 and 11 are reserved to avoid conflicts with rogue DGA extensions */ + +#define X_XDGAQueryModes 12 +#define X_XDGASetMode 13 +#define X_XDGASetViewport 14 +#define X_XDGAInstallColormap 15 +#define X_XDGASelectInput 16 +#define X_XDGAFillRectangle 17 +#define X_XDGACopyArea 18 +#define X_XDGACopyTransparentArea 19 +#define X_XDGAGetViewportStatus 20 +#define X_XDGASync 21 +#define X_XDGAOpenFramebuffer 22 +#define X_XDGACloseFramebuffer 23 +#define X_XDGASetClientVersion 24 +#define X_XDGAChangePixmapMode 25 +#define X_XDGACreateColormap 26 + + +#define XDGAConcurrentAccess 0x00000001 +#define XDGASolidFillRect 0x00000002 +#define XDGABlitRect 0x00000004 +#define XDGABlitTransRect 0x00000008 +#define XDGAPixmap 0x00000010 + +#define XDGAInterlaced 0x00010000 +#define XDGADoublescan 0x00020000 + +#define XDGAFlipImmediate 0x00000001 +#define XDGAFlipRetrace 0x00000002 + +#define XDGANeedRoot 0x00000001 + +#define XF86DGANumberEvents 7 + +#define XDGAPixmapModeLarge 0 +#define XDGAPixmapModeSmall 1 + +#define XF86DGAClientNotLocal 0 +#define XF86DGANoDirectVideoMode 1 +#define XF86DGAScreenNotActive 2 +#define XF86DGADirectNotActivated 3 +#define XF86DGAOperationNotSupported 4 +#define XF86DGANumberErrors (XF86DGAOperationNotSupported + 1) + + +typedef struct { + int num; /* A unique identifier for the mode (num > 0) */ + char *name; /* name of mode given in the XF86Config */ + float verticalRefresh; + int flags; /* DGA_CONCURRENT_ACCESS, etc... */ + int imageWidth; /* linear accessible portion (pixels) */ + int imageHeight; + int pixmapWidth; /* Xlib accessible portion (pixels) */ + int pixmapHeight; /* both fields ignored if no concurrent access */ + int bytesPerScanline; + int byteOrder; /* MSBFirst, LSBFirst */ + int depth; + int bitsPerPixel; + unsigned long redMask; + unsigned long greenMask; + unsigned long blueMask; + short visualClass; + int viewportWidth; + int viewportHeight; + int xViewportStep; /* viewport position granularity */ + int yViewportStep; + int maxViewportX; /* max viewport origin */ + int maxViewportY; + int viewportFlags; /* types of page flipping possible */ + int reserved1; + int reserved2; +} XDGAMode; + + +typedef struct { + XDGAMode mode; + unsigned char *data; + Pixmap pixmap; +} XDGADevice; + + +#endif /* _XF86DGACONST_H_ */ -- cgit v1.2.1