From de03d62270f33f1e6104fea13a7742bb6a5dc609 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 13 Apr 2016 11:33:33 +0200 Subject: NXrenderint.h: Move into subfolder X11/include/ and rename to Xrender_nxagent.h. (Like we have done with all other non-public Xlib related header files that are required for building nxagent. --- nx-X11/programs/Xserver/hw/nxagent/NXrenderint.h | 111 --------------------- nx-X11/programs/Xserver/hw/nxagent/Render.c | 2 +- .../hw/nxagent/X11/include/Xrenderint_nxagent.h | 111 +++++++++++++++++++++ 3 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/NXrenderint.h create mode 100644 nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrenderint.h b/nx-X11/programs/Xserver/hw/nxagent/NXrenderint.h deleted file mode 100644 index f67922c6b..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrenderint.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - * - * Copyright © 2000 SuSE, Inc. - * - * 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, and that the name of SuSE not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. SuSE makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE - * 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. - * - * Author: Keith Packard, SuSE, Inc. - */ - -#ifndef _XRENDERINT_H_ -#define _XRENDERINT_H_ - -#include -#include -#include -#include "X11/include/Xrender_nxagent.h" - -typedef struct { - Visual *visual; - XRenderPictFormat *format; -} XRenderVisual; - -typedef struct { - int depth; - int nvisuals; - XRenderVisual *visuals; -} XRenderDepth; - -typedef struct { - XRenderDepth *depths; - int ndepths; - XRenderPictFormat *fallback; - int subpixel; -} XRenderScreen; - -typedef struct _XRenderInfo { - int major_version; - int minor_version; - XRenderPictFormat *format; - int nformat; - XRenderScreen *screen; - int nscreen; - XRenderDepth *depth; - int ndepth; - XRenderVisual *visual; - int nvisual; - int *subpixel; - int nsubpixel; - char **filter; - int nfilter; - short *filter_alias; - int nfilter_alias; -} XRenderInfo; - -/* replaces XRenderExtDisplayInfo */ -typedef struct _XRenderExtDisplayInfo { - struct _XRenderExtDisplayInfo *next; /* keep a linked list */ - Display *display; /* which display this is */ - XExtCodes *codes; /* the extension protocol codes */ - XRenderInfo *info; /* extra data for the extension to use */ -} XRenderExtDisplayInfo; - -/* replaces XExtensionInfo */ -typedef struct _XRenderExtInfo { - XRenderExtDisplayInfo *head; /* start of the list */ - XRenderExtDisplayInfo *cur; /* most recently used */ - int ndisplays; /* number of displays */ -} XRenderExtInfo; - -extern XRenderExtInfo XRenderExtensionInfo; -extern char XRenderExtensionName[]; - -XRenderExtDisplayInfo * -XRenderFindDisplay (Display *dpy); - -#define RenderHasExtension(i) ((i) && ((i)->codes)) - -#define RenderCheckExtension(dpy,i,val) \ - if (!RenderHasExtension(i)) { return val; } - -#define RenderSimpleCheckExtension(dpy,i) \ - if (!RenderHasExtension(i)) { return; } - -/* - * Xlib uses long for 32-bit values. Xrender uses int. This - * matters on alpha. Note that this macro assumes that int is 32 bits - * except on WORD64 machines where it is 64 bits. - */ - -#ifdef WORD64 -#define DataInt32(dpy,d,len) Data32(dpy,(long *) (d),len) -#else -#define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len) -#endif - -#endif /* _XRENDERINT_H_ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index d5f64d05b..b4bd615e7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -39,7 +39,7 @@ #define Atom XlibAtom #define Pixmap XlibPixmap -#include "NXrenderint.h" +#include "X11/include/Xrenderint_nxagent.h" #undef Atom #undef Pixmap diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h new file mode 100644 index 000000000..823d1e427 --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h @@ -0,0 +1,111 @@ +/* + * + * Copyright © 2000 SuSE, Inc. + * + * 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, and that the name of SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _XRENDERINT_H_ +#define _XRENDERINT_H_ + +#include +#include +#include +#include "Xrender_nxagent.h" + +typedef struct { + Visual *visual; + XRenderPictFormat *format; +} XRenderVisual; + +typedef struct { + int depth; + int nvisuals; + XRenderVisual *visuals; +} XRenderDepth; + +typedef struct { + XRenderDepth *depths; + int ndepths; + XRenderPictFormat *fallback; + int subpixel; +} XRenderScreen; + +typedef struct _XRenderInfo { + int major_version; + int minor_version; + XRenderPictFormat *format; + int nformat; + XRenderScreen *screen; + int nscreen; + XRenderDepth *depth; + int ndepth; + XRenderVisual *visual; + int nvisual; + int *subpixel; + int nsubpixel; + char **filter; + int nfilter; + short *filter_alias; + int nfilter_alias; +} XRenderInfo; + +/* replaces XRenderExtDisplayInfo */ +typedef struct _XRenderExtDisplayInfo { + struct _XRenderExtDisplayInfo *next; /* keep a linked list */ + Display *display; /* which display this is */ + XExtCodes *codes; /* the extension protocol codes */ + XRenderInfo *info; /* extra data for the extension to use */ +} XRenderExtDisplayInfo; + +/* replaces XExtensionInfo */ +typedef struct _XRenderExtInfo { + XRenderExtDisplayInfo *head; /* start of the list */ + XRenderExtDisplayInfo *cur; /* most recently used */ + int ndisplays; /* number of displays */ +} XRenderExtInfo; + +extern XRenderExtInfo XRenderExtensionInfo; +extern char XRenderExtensionName[]; + +XRenderExtDisplayInfo * +XRenderFindDisplay (Display *dpy); + +#define RenderHasExtension(i) ((i) && ((i)->codes)) + +#define RenderCheckExtension(dpy,i,val) \ + if (!RenderHasExtension(i)) { return val; } + +#define RenderSimpleCheckExtension(dpy,i) \ + if (!RenderHasExtension(i)) { return; } + +/* + * Xlib uses long for 32-bit values. Xrender uses int. This + * matters on alpha. Note that this macro assumes that int is 32 bits + * except on WORD64 machines where it is 64 bits. + */ + +#ifdef WORD64 +#define DataInt32(dpy,d,len) Data32(dpy,(long *) (d),len) +#else +#define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len) +#endif + +#endif /* _XRENDERINT_H_ */ -- cgit v1.2.3