XEVI: remove XEVI.h library header, split into EVIproto.h

Remove Xlib function prototypes.
Move protocol opcodes to EVIproto.h
Move extension name from EVIproto.h into EVI.h
This commit is contained in:
Peter Hutterer 2009-06-25 10:30:40 +10:00
parent 3770d4bd03
commit 727003b518
3 changed files with 18 additions and 44 deletions

View file

@ -23,42 +23,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86$ */
#ifndef _XEVI_H_
#define _XEVI_H_
#include <X11/Xfuncproto.h>
#define X_EVIQueryVersion 0
#define X_EVIGetVisualInfo 1
#ifndef _EVI_H_
#define _EVI_H_
#define XEVI_TRANSPARENCY_NONE 0
#define XEVI_TRANSPARENCY_PIXEL 1
#define XEVI_TRANSPARENCY_MASK 2
#ifndef _XEVI_SERVER_
typedef struct {
VisualID core_visual_id;
int screen;
int level;
unsigned int transparency_type;
unsigned int transparency_value;
unsigned int min_hw_colormaps;
unsigned int max_hw_colormaps;
unsigned int num_colormap_conflicts;
VisualID* colormap_conflicts;
} ExtendedVisualInfo;
_XFUNCPROTOBEGIN
Bool XeviQueryExtension(
Display* /* dpy */
);
Status XeviQueryVersion(
Display* /* dpy */,
int* /* majorVersion */,
int* /* minorVersion */
);
Status XeviGetVisualInfo(
Display* /* dpy */,
VisualID* /* visual_query */,
int /* nVisual_query */,
ExtendedVisualInfo** /* extendedVisualInfo_return */,
int* /* nInfo_return */
);
_XFUNCPROTOEND
#endif
#define EVINAME "Extended-Visual-Information"
#define XEVI_MAJOR_VERSION 1 /* current version numbers */
#define XEVI_MINOR_VERSION 0
#endif

View file

@ -23,15 +23,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86$ */
#ifndef _EVISTR_H_
#define _EVISTR_H_
#ifndef _EVIPROTO_H_
#define _EVIPROTO_H_
#include <X11/extensions/XEVI.h>
#include <X11/extensions/EVI.h>
#define X_EVIQueryVersion 0
#define X_EVIGetVisualInfo 1
#define VisualID CARD32
#define EVINAME "Extended-Visual-Information"
#define XEVI_MAJOR_VERSION 1 /* current version numbers */
#define XEVI_MINOR_VERSION 0
typedef CARD32 VisualID32;
#define sz_VisualID32 4
@ -95,4 +95,4 @@ typedef struct _XEVIGetVisualInfoReply {
#undef VisualID
#endif /* _EVISTR_H_ */
#endif /* _EVIPROTO_H_ */

View file

@ -24,8 +24,8 @@ xext_HEADERS = \
Xcupstr.h \
Xdbe.h \
Xdbeproto.h \
XEVI.h \
XEVIstr.h \
EVI.h \
EVIproto.h \
Xext.h \
XLbx.h \
XShm.h \