Move the headers under include/X11/...

I kinda hate to do this, it was nice to have everything in one place.
However, the meson build wants to be able to wrap this module as a
dependency, and code that depends on these headers includes them in the
form:

    #include <X11/Xfuncproto.h>

As a result, any include path meson can construct needs to point to the
root of a hierarchy that has the same path layout as an installed copy,
hence this change.

Signed-off-by: Adam Jackson <ajax@redhat.com>

1 files changed, 130 insertions, 0 deletions

diff --git a/include/X11/extensions/fontcachstr.h b/include/X11/extensions/fontcachstr.h
new file mode 100644
index 0000000..eab704e
--- /dev/null
+++ b/include/X11/extensions/fontcachstr.h
@@ -0,0 +1,130 @@
+/*-
+ * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
+ * All rights reserved.
+ * Copyright (c) 1998-1999 X-TrueType Server Project, All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $
+ */
+/* $XFree86$ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#ifndef _FONTCACHESTR_H_
+#define _FONTCACHESTR_H_
+
+#include <X11/extensions/fontcache.h>
+
+#define FONTCACHENAME		"FontCache"
+
+#define FONTCACHE_MAJOR_VERSION	0	/* current version numbers */
+#define FONTCACHE_MINOR_VERSION	1
+
+typedef struct _FontCacheQueryVersion {
+    CARD8	reqType;		/* always FontCacheReqCode */
+    CARD8	fontcacheReqType;	/* always X_FontCacheQueryVersion */
+    CARD16	length B16;
+} xFontCacheQueryVersionReq;
+#define sz_xFontCacheQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of Font-Cache */
+    CARD16	minorVersion B16;	/* minor version of Font-Cache */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xFontCacheQueryVersionReply;
+#define sz_xFontCacheQueryVersionReply	32
+
+typedef struct _FontCacheGetCacheSettings {
+    CARD8	reqType;		/* always FontCacheReqCode */
+    CARD8	fontcacheReqType;	/* always X_FontCacheGetCacheSettings */
+    CARD16	length B16;
+} xFontCacheGetCacheSettingsReq;
+#define sz_xFontCacheGetCacheSettingsReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	himark B32;
+    CARD32	lowmark B32;
+    CARD32	balance B32;
+    CARD32	reserve0 B32;
+    CARD32	reserve1 B32;
+    CARD32	reserve2 B32;
+} xFontCacheGetCacheSettingsReply;
+#define sz_xFontCacheGetCacheSettingsReply	32
+
+typedef struct _FontCacheChangeCacheSettings {
+    CARD8	reqType;		/* always FontCacheReqCode */
+    CARD8	fontcacheReqType;	/* always X_FontCacheChangeCacheSettings */
+    CARD16	length B16;
+    CARD32	himark B32;
+    CARD32	lowmark B32;
+    CARD32	balance B32;
+    CARD32	reserve0 B32;
+    CARD32	reserve1 B32;
+    CARD32	reserve2 B32;
+    CARD32	reserve3 B32;
+} xFontCacheChangeCacheSettingsReq;
+#define sz_xFontCacheChangeCacheSettingsReq	32
+
+typedef struct _FontCacheGetCacheStatistics {
+    CARD8	reqType;		/* always FontCacheReqCode */
+    CARD8	fontcacheReqType;	/* always X_FontCacheGetCacheStatistics */
+    CARD16	length B16;
+} xFontCacheGetCacheStatisticsReq;
+#define sz_xFontCacheGetCacheStatisticsReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	purge_runs B32;
+    CARD32	purge_stat B32;
+    CARD32	balance B32;
+    CARD32	reserve0 B32;
+    CARD32	f_hits B32;
+    CARD32	f_misshits B32;
+    CARD32	f_purged B32;
+    CARD32	f_usage B32;
+    CARD32	f_reserve0 B32;
+    CARD32	v_hits B32;
+    CARD32	v_misshits B32;
+    CARD32	v_purged B32;
+    CARD32	v_usage B32;
+    CARD32	v_reserve0 B32;
+} xFontCacheGetCacheStatisticsReply;
+#define sz_xFontCacheGetCacheStatisticsReply	64
+
+#endif /* _FONTCACHESTR_H_ */