aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include/fonts
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
commitb964406ba6e7e2d65b88010856ce881ee928898a (patch)
tree2c37d81d17f33bf288c3a44adc11bc328ee8e697 /nx-X11/include/fonts
parenta77ca871c6c1b0d6d866f95e4eb6e013f92e9627 (diff)
parent70b77a0fc329e2e205a596a738c7307d354e7b1c (diff)
downloadnx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.gz
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.bz2
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.zip
Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x
Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14
Diffstat (limited to 'nx-X11/include/fonts')
-rw-r--r--nx-X11/include/fonts/FS.h132
-rw-r--r--nx-X11/include/fonts/FSproto.h816
-rw-r--r--nx-X11/include/fonts/Imakefile22
-rw-r--r--nx-X11/include/fonts/font.h169
-rw-r--r--nx-X11/include/fonts/fontproto.h93
-rw-r--r--nx-X11/include/fonts/fontstruct.h295
-rw-r--r--nx-X11/include/fonts/fsmasks.h98
7 files changed, 0 insertions, 1625 deletions
diff --git a/nx-X11/include/fonts/FS.h b/nx-X11/include/fonts/FS.h
deleted file mode 100644
index e90752233..000000000
--- a/nx-X11/include/fonts/FS.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-/*
- * Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
- *
- * 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 names of Network Computing Devices or Digital
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- * Network Computing Devices and Digital make no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES
- * OR 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.
- */
-
-/*
-
-Portions Copyright 1987, 1994, 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.
-
-*/
-/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */
-
-#ifndef _FS_H_
-#define _FS_H_
-
-#include <X11/Xdefs.h>
-#include <X11/fonts/fsmasks.h>
-
-#define FS_PROTOCOL 2
-#define FS_PROTOCOL_MINOR 0
-
-#ifndef X_PROTOCOL
-/* protocol familes */
-#define FamilyInternet 0
-#define FamilyDECnet 1
-#define FamilyChaos 2
-#define FamilyInternet6 6
-
-
-typedef unsigned int FSDrawDirection;
-#endif
-
-#ifndef None
-#define None 0L
-#endif
-
-#define LeftToRightDrawDirection 0
-#define RightToLeftDrawDirection 1
-
-/* font info flags */
-#define FontInfoAllCharsExist (1L << 0)
-#define FontInfoInkInside (1L << 1)
-#define FontInfoHorizontalOverlap (1L << 2)
-
-/* auth status flags */
-#define AuthSuccess 0
-#define AuthContinue 1
-#define AuthBusy 2
-#define AuthDenied 3
-
-/* property types */
-#define PropTypeString 0
-#define PropTypeUnsigned 1
-#define PropTypeSigned 2
-
-#ifndef LSBFirst
-/* byte order */
-#define LSBFirst 0
-#define MSBFirst 1
-#endif
-
-/* event masks */
-#define CatalogueChangeNotifyMask (1L << 0)
-#define FontChangeNotifyMask (1L << 1)
-
-/* errors */
-#define FSSuccess -1
-#define FSBadRequest 0
-#define FSBadFormat 1
-#define FSBadFont 2
-#define FSBadRange 3
-#define FSBadEventMask 4
-#define FSBadAccessContext 5
-#define FSBadIDChoice 6
-#define FSBadName 7
-#define FSBadResolution 8
-#define FSBadAlloc 9
-#define FSBadLength 10
-#define FSBadImplementation 11
-
-#define FirstExtensionError 128
-#define LastExtensionError 255
-
-/* events */
-#define KeepAlive 0
-#define CatalogueChangeNotify 1
-#define FontChangeNotify 2
-#define FSLASTEvent 3
-
-#endif /* _FS_H_ */
diff --git a/nx-X11/include/fonts/FSproto.h b/nx-X11/include/fonts/FSproto.h
deleted file mode 100644
index 03b28089f..000000000
--- a/nx-X11/include/fonts/FSproto.h
+++ /dev/null
@@ -1,816 +0,0 @@
-/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
-/*
-
-Copyright 1990, 1991, 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 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
- *
- * 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 names of Network Computing Devices, or Digital
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- *
- * NETWORK COMPUTING DEVICES, AND DIGITAL DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES,
- * OR 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.
- */
-/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */
-
-#ifndef _FS_PROTO_H_
-#define _FS_PROTO_H_
-
-#include <X11/fonts/FS.h>
-
-#define sz_fsPropOffset 20
-#define sz_fsPropInfo 8
-#define sz_fsResolution 6
-
-#define sz_fsChar2b 2
-#define sz_fsChar2b_version1 2
-#define sz_fsOffset32 8
-#define sz_fsRange 4
-
-#define sz_fsXCharInfo 12
-#define sz_fsXFontInfoHeader 40
-
-#define sz_fsConnClientPrefix 8
-#define sz_fsConnSetup 12
-#define sz_fsConnSetupExtra 8
-#define sz_fsConnSetupAccept 12
-
-/* request sizes */
-#define sz_fsReq 4
-#define sz_fsListExtensionsReq 4
-#define sz_fsResourceReq 8
-
-#define sz_fsNoopReq 4
-#define sz_fsListExtensionReq 4
-#define sz_fsQueryExtensionReq 4
-#define sz_fsListCataloguesReq 12
-#define sz_fsSetCataloguesReq 4
-#define sz_fsGetCataloguesReq 4
-#define sz_fsSetEventMaskReq 8
-#define sz_fsGetEventMaskReq 4
-#define sz_fsCreateACReq 8
-#define sz_fsFreeACReq 8
-#define sz_fsSetAuthorizationReq 8
-#define sz_fsSetResolutionReq 4
-#define sz_fsGetResolutionReq 4
-#define sz_fsListFontsReq 12
-#define sz_fsListFontsWithXInfoReq 12
-#define sz_fsOpenBitmapFontReq 16
-#define sz_fsQueryXInfoReq 8
-#define sz_fsQueryXExtents8Req 12
-#define sz_fsQueryXExtents16Req 12
-#define sz_fsQueryXBitmaps8Req 16
-#define sz_fsQueryXBitmaps16Req 16
-#define sz_fsCloseReq 8
-
-/* reply sizes */
-#define sz_fsReply 8
-#define sz_fsGenericReply 8
-
-#define sz_fsListExtensionsReply 8
-#define sz_fsQueryExtensionReply 20
-#define sz_fsListCataloguesReply 16
-#define sz_fsGetCataloguesReply 8
-#define sz_fsGetEventMaskReply 12
-#define sz_fsCreateACReply 12
-#define sz_fsGetResolutionReply 8
-#define sz_fsListFontsReply 16
-#define sz_fsListFontsWithXInfoReply (12 + sz_fsXFontInfoHeader)
-#define sz_fsOpenBitmapFontReply 16
-#define sz_fsQueryXInfoReply (8 + sz_fsXFontInfoHeader)
-#define sz_fsQueryXExtents8Reply 12
-#define sz_fsQueryXExtents16Reply 12
-#define sz_fsQueryXBitmaps8Reply 20
-#define sz_fsQueryXBitmaps16Reply 20
-
-#define sz_fsError 16
-#define sz_fsEvent 12
-#define sz_fsKeepAliveEvent 12
-
-#define fsTrue 1
-#define fsFalse 0
-
-/* temp decls */
-#define Mask CARD32
-#define Font CARD32
-#define AccContext CARD32
-
-typedef CARD32 fsTimestamp;
-
-#ifdef NOTDEF /* in fsmasks.h */
-typedef CARD32 fsBitmapFormat;
-typedef CARD32 fsBitmapFormatMask;
-#endif
-
-#define sz_fsBitmapFormat 4
-
-typedef struct {
- INT16 left B16,
- right B16;
- INT16 width B16;
- INT16 ascent B16,
- descent B16;
- CARD16 attributes B16;
-} fsXCharInfo;
-
-typedef struct {
- CARD8 high;
- CARD8 low;
-} fsChar2b;
-
-typedef struct {
- CARD8 low;
- CARD8 high;
-} fsChar2b_version1;
-
-typedef struct {
- CARD8 min_char_high;
- CARD8 min_char_low;
- CARD8 max_char_high;
- CARD8 max_char_low;
-} fsRange;
-
-typedef struct {
- CARD32 position B32;
- CARD32 length B32;
-} fsOffset32;
-
-typedef struct {
- fsOffset32 name;
- fsOffset32 value;
- CARD8 type;
- BYTE pad0;
- CARD16 pad1 B16;
-} fsPropOffset;
-
-typedef struct {
- CARD32 num_offsets B32;
- CARD32 data_len B32;
- /* offsets */
- /* data */
-} fsPropInfo;
-
-typedef struct {
- CARD16 x_resolution B16;
- CARD16 y_resolution B16;
- CARD16 point_size B16;
-} fsResolution;
-
-
-typedef struct {
- CARD32 flags B32;
- CARD8 char_range_min_char_high;
- CARD8 char_range_min_char_low;
- CARD8 char_range_max_char_high;
- CARD8 char_range_max_char_low;
-
- CARD8 draw_direction;
- CARD8 pad;
- CARD8 default_char_high;
- CARD8 default_char_low;
- INT16 min_bounds_left B16;
- INT16 min_bounds_right B16;
-
- INT16 min_bounds_width B16;
- INT16 min_bounds_ascent B16;
- INT16 min_bounds_descent B16;
- CARD16 min_bounds_attributes B16;
-
- INT16 max_bounds_left B16;
- INT16 max_bounds_right B16;
- INT16 max_bounds_width B16;
- INT16 max_bounds_ascent B16;
-
- INT16 max_bounds_descent B16;
- CARD16 max_bounds_attributes B16;
- INT16 font_ascent B16;
- INT16 font_descent B16;
- /* propinfo */
-} fsXFontInfoHeader;
-
-
-/* requests */
-
-typedef struct {
- BYTE byteOrder;
- CARD8 num_auths;
- CARD16 major_version B16;
- CARD16 minor_version B16;
- CARD16 auth_len B16;
- /* auth data */
-} fsConnClientPrefix;
-
-typedef struct {
- CARD16 status B16;
- CARD16 major_version B16;
- CARD16 minor_version B16;
- CARD8 num_alternates;
- CARD8 auth_index;
- CARD16 alternate_len B16;
- CARD16 auth_len B16;
- /* alternates */
- /* auth data */
-} fsConnSetup;
-
-typedef struct {
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
- /* more auth data */
-} fsConnSetupExtra;
-
-typedef struct {
- CARD32 length B32;
- CARD16 max_request_len B16;
- CARD16 vendor_len B16;
- CARD32 release_number B32;
- /* vendor string */
-} fsConnSetupAccept;
-
-typedef struct {
- CARD8 reqType;
- CARD8 data;
- CARD16 length B16;
-} fsReq;
-
-/*
- * The fsFakeReq structure is never used in the protocol; it is prepended
- * to incoming packets when setting up a connection so we can index
- * through InitialVector. To avoid alignment problems, it is padded
- * to the size of a word on the largest machine this code runs on.
- * Hence no sz_fsFakeReq constant is necessary.
- */
-typedef struct {
- CARD8 reqType;
- CARD8 data;
- CARD16 length B16;
- CARD32 pad B32; /* to fill out to multiple of 64 bits */
-} fsFakeReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE pad;
- CARD16 length B16;
- Font id B32;
-} fsResourceReq;
-
-typedef fsReq fsNoopReq;
-typedef fsReq fsListExtensionsReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE nbytes;
- CARD16 length B16;
- /* name */
-} fsQueryExtensionReq;
-
-typedef struct {
- CARD8 reqType;
- CARD8 data;
- CARD16 length B16;
- CARD32 maxNames B32;
- CARD16 nbytes B16;
- CARD16 pad2 B16;
- /* pattern */
-} fsListCataloguesReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE num_catalogues;
- CARD16 length B16;
- /* catalogues */
-} fsSetCataloguesReq;
-
-typedef fsReq fsGetCataloguesReq;
-
-typedef struct {
- CARD8 reqType;
- CARD8 ext_opcode;
- CARD16 length B16;
- Mask event_mask;
-} fsSetEventMaskReq;
-
-typedef struct {
- CARD8 reqType;
- CARD8 ext_opcode;
- CARD16 length B16;
-} fsGetEventMaskReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE num_auths;
- CARD16 length B16;
- AccContext acid B32;
- /* auth protocols */
-} fsCreateACReq;
-
-typedef fsResourceReq fsFreeACReq;
-typedef fsResourceReq fsSetAuthorizationReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE num_resolutions;
- CARD16 length B16;
- /* resolutions */
-} fsSetResolutionReq;
-
-typedef fsReq fsGetResolutionReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE pad;
- CARD16 length B16;
- CARD32 maxNames B32;
- CARD16 nbytes B16;
- CARD16 pad2 B16;
- /* pattern */
-} fsListFontsReq;
-
-typedef fsListFontsReq fsListFontsWithXInfoReq;
-
-typedef struct {
- CARD8 reqType;
- BYTE pad;
- CARD16 length B16;
- Font fid B32;
- fsBitmapFormatMask format_mask B32;
- fsBitmapFormat format_hint B32;
- /* pattern */
-} fsOpenBitmapFontReq;
-
-typedef fsResourceReq fsQueryXInfoReq;
-
-typedef struct {
- CARD8 reqType;
- BOOL range;
- CARD16 length B16;
- Font fid B32;
- CARD32 num_ranges B32;
- /* list of chars */
-} fsQueryXExtents8Req;
-
-typedef fsQueryXExtents8Req fsQueryXExtents16Req;
-
-typedef struct {
- CARD8 reqType;
- BOOL range;
- CARD16 length B16;
- Font fid B32;
- fsBitmapFormat format B32;
- CARD32 num_ranges B32;
- /* list of chars */
-} fsQueryXBitmaps8Req;
-
-typedef fsQueryXBitmaps8Req fsQueryXBitmaps16Req;
-
-typedef fsResourceReq fsCloseReq;
-
-
-/* replies */
-typedef struct {
- BYTE type;
- BYTE data1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
-} fsGenericReply;
-
-typedef struct {
- BYTE type;
- CARD8 nExtensions;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- /* extension names */
-} fsListExtensionsReply;
-
-typedef struct {
- BYTE type;
- CARD8 present;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 major_version B16;
- CARD16 minor_version B16;
- CARD8 major_opcode;
- CARD8 first_event;
- CARD8 num_events;
- CARD8 first_error;
- CARD8 num_errors;
- CARD8 pad1;
- CARD16 pad2 B16;
-} fsQueryExtensionReply;
-
-typedef struct {
- BYTE type;
- BYTE pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_replies B32;
- CARD32 num_catalogues B32;
- /* catalog names */
-} fsListCataloguesReply;
-
-typedef struct {
- BYTE type;
- CARD8 num_catalogues;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- /* catalogue names */
-} fsGetCataloguesReply;
-
-typedef struct {
- BYTE type;
- BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 event_mask B32;
-} fsGetEventMaskReply;
-
-typedef struct {
- BYTE type;
- CARD8 auth_index;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
- /* auth data */
-} fsCreateACReply;
-
-typedef struct {
- CARD32 length B32;
- CARD16 status B16;
- CARD16 pad B16;
- /* auth data */
-} fsCreateACExtraReply;
-
-typedef struct {
- BYTE type;
- CARD8 num_resolutions;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- /* resolutions */
-} fsGetResolutionReply;
-
-typedef struct {
- BYTE type;
- BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 following B32;
- CARD32 nFonts B32;
- /* font names */
-} fsListFontsReply;
-
-/*
- * this one is messy. the reply itself is variable length (unknown
- * number of replies) and the contents of each is variable (unknown
- * number of properties)
- *
- */
-
-typedef struct {
- BYTE type;
- CARD8 nameLength; /* 0 is end-of-reply */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 nReplies B32;
- CARD32 font_header_flags B32;
- CARD8 font_hdr_char_range_min_char_high;
- CARD8 font_hdr_char_range_min_char_low;
- CARD8 font_hdr_char_range_max_char_high;
- CARD8 font_hdr_char_range_max_char_low;
- CARD8 font_header_draw_direction;
- CARD8 font_header_pad;
- CARD8 font_header_default_char_high;
- CARD8 font_header_default_char_low;
- INT16 font_header_min_bounds_left B16;
- INT16 font_header_min_bounds_right B16;
- INT16 font_header_min_bounds_width B16;
- INT16 font_header_min_bounds_ascent B16;
- INT16 font_header_min_bounds_descent B16;
- CARD16 font_header_min_bounds_attributes B16;
- INT16 font_header_max_bounds_left B16;
- INT16 font_header_max_bounds_right B16;
- INT16 font_header_max_bounds_width B16;
- INT16 font_header_max_bounds_ascent B16;
- INT16 font_header_max_bounds_descent B16;
- CARD16 font_header_max_bounds_attributes B16;
- INT16 font_header_font_ascent B16;
- INT16 font_header_font_descent B16;
- /* propinfo */
- /* name */
-} fsListFontsWithXInfoReply;
-
-typedef struct {
- BYTE type;
- CARD8 otherid_valid;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 otherid B32;
- BYTE cachable;
- BYTE pad1;
- CARD16 pad2 B16;
-} fsOpenBitmapFontReply;
-
-typedef struct {
- BYTE type;
- CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 font_header_flags B32;
- CARD8 font_hdr_char_range_min_char_high;
- CARD8 font_hdr_char_range_min_char_low;
- CARD8 font_hdr_char_range_max_char_high;
- CARD8 font_hdr_char_range_max_char_low;
- CARD8 font_header_draw_direction;
- CARD8 font_header_pad;
- CARD8 font_header_default_char_high;
- CARD8 font_header_default_char_low;
- INT16 font_header_min_bounds_left B16;
- INT16 font_header_min_bounds_right B16;
- INT16 font_header_min_bounds_width B16;
- INT16 font_header_min_bounds_ascent B16;
- INT16 font_header_min_bounds_descent B16;
- CARD16 font_header_min_bounds_attributes B16;
- INT16 font_header_max_bounds_left B16;
- INT16 font_header_max_bounds_right B16;
- INT16 font_header_max_bounds_width B16;
- INT16 font_header_max_bounds_ascent B16;
- INT16 font_header_max_bounds_descent B16;
- CARD16 font_header_max_bounds_attributes B16;
- INT16 font_header_font_ascent B16;
- INT16 font_header_font_descent B16;
- /* propinfo */
-} fsQueryXInfoReply;
-
-typedef struct {
- BYTE type;
- CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_extents B32;
- /* extents */
-} fsQueryXExtents8Reply;
-
-typedef fsQueryXExtents8Reply fsQueryXExtents16Reply;
-
-typedef struct {
- BYTE type;
- CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 replies_hint B32;
- CARD32 num_chars B32;
- CARD32 nbytes B32;
- /* offsets */
- /* glyphs */
-} fsQueryXBitmaps8Reply;
-
-typedef fsQueryXBitmaps8Reply fsQueryXBitmaps16Reply;
-
-typedef union {
- fsGenericReply generic;
- fsListExtensionsReply extensions;
- fsGetResolutionReply getres;
-} fsReply;
-
-/* errors */
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
-} fsError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
-} fsRequestError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- fsBitmapFormat format B32;
-} fsFormatError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- Font fontid;
-} fsFontError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- fsRange range;
-} fsRangeError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- Mask event_mask;
-} fsEventMaskError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- AccContext acid;
-} fsAccessContextError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- Font fontid;
-} fsIDChoiceError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
-} fsNameError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- fsResolution resolution;
-} fsResolutionError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
-} fsAllocError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
- CARD32 bad_length B32;
-} fsLengthError;
-
-typedef struct {
- BYTE type;
- BYTE request;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- CARD8 major_opcode;
- CARD8 minor_opcode;
- CARD16 pad B16;
-} fsImplementationError;
-
-/* events */
-typedef struct {
- BYTE type;
- BYTE event_code;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
-} fsKeepAliveEvent;
-
-typedef struct {
- BYTE type;
- BYTE event_code;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- fsTimestamp timestamp;
- BOOL added;
- BOOL deleted;
- CARD16 pad B16;
-} fsCatalogueChangeNotifyEvent;
-
-typedef fsCatalogueChangeNotifyEvent fsFontChangeNotifyEvent;
-
-typedef fsCatalogueChangeNotifyEvent fsEvent;
-
-/* reply codes */
-#define FS_Reply 0 /* normal reply */
-#define FS_Error 1 /* error */
-#define FS_Event 2
-
-/* request codes */
-#define FS_Noop 0
-#define FS_ListExtensions 1
-#define FS_QueryExtension 2
-#define FS_ListCatalogues 3
-#define FS_SetCatalogues 4
-#define FS_GetCatalogues 5
-#define FS_SetEventMask 6
-#define FS_GetEventMask 7
-#define FS_CreateAC 8
-#define FS_FreeAC 9
-#define FS_SetAuthorization 10
-#define FS_SetResolution 11
-#define FS_GetResolution 12
-#define FS_ListFonts 13
-#define FS_ListFontsWithXInfo 14
-#define FS_OpenBitmapFont 15
-#define FS_QueryXInfo 16
-#define FS_QueryXExtents8 17
-#define FS_QueryXExtents16 18
-#define FS_QueryXBitmaps8 19
-#define FS_QueryXBitmaps16 20
-#define FS_CloseFont 21
-
-/* restore decls */
-#undef Mask
-#undef Font
-#undef AccContext
-
-#endif /* _FS_PROTO_H_ */
diff --git a/nx-X11/include/fonts/Imakefile b/nx-X11/include/fonts/Imakefile
deleted file mode 100644
index 0eae8a3bc..000000000
--- a/nx-X11/include/fonts/Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
-
-
-
-
-XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.7 2001/01/17 17:53:26 dawes Exp $
-
- HEADERS = FS.h FSproto.h font.h fontstruct.h fsmasks.h
-
-all::
-
-BuildIncludes($(HEADERS),X11/fonts,../..)
-
-#if BuildLibraries
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/fonts,$(INSTINCFLAGS))
-#endif
-
-
-InstallDriverSDKNonExecFile(font.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(fontproto.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(fontstruct.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(fsmasks.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/nx-X11/include/fonts/font.h b/nx-X11/include/fonts/font.h
deleted file mode 100644
index e6a00cddb..000000000
--- a/nx-X11/include/fonts/font.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, 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 name of Digital 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.
-
-******************************************************************/
-/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
-/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
-
-#ifndef FONT_H
-#define FONT_H
-
-#ifndef BitmapFormatByteOrderMask
-#include "fsmasks.h"
-#endif
-
-/* data structures */
-#ifndef _XTYPEDEF_FONTPTR
-typedef struct _Font *FontPtr;
-#define _XTYPEDEF_FONTPTR
-#endif
-
-typedef struct _FontInfo *FontInfoPtr;
-typedef struct _FontProp *FontPropPtr;
-typedef struct _ExtentInfo *ExtentInfoPtr;
-typedef struct _FontPathElement *FontPathElementPtr;
-
-#ifndef _XTYPEDEF_CHARINFOPTR
-typedef struct _CharInfo *CharInfoPtr;
-#define _XTYPEDEF_CHARINFOPTR
-#endif
-
-typedef struct _FontNames *FontNamesPtr;
-typedef struct _FontResolution *FontResolutionPtr;
-
-#define NullCharInfo ((CharInfoPtr) 0)
-#define NullFont ((FontPtr) 0)
-#define NullFontInfo ((FontInfoPtr) 0)
-
- /* draw direction */
-#define LeftToRight 0
-#define RightToLeft 1
-#define BottomToTop 2
-#define TopToBottom 3
-typedef int DrawDirection;
-
-#define NO_SUCH_CHAR -1
-
-
-#define FontAliasType 0x1000
-
-#define AllocError 80
-#define StillWorking 81
-#define FontNameAlias 82
-#define BadFontName 83
-#define Suspended 84
-#define Successful 85
-#define BadFontPath 86
-#define BadCharRange 87
-#define BadFontFormat 88
-#define FPEResetFailed 89 /* for when an FPE reset won't work */
-
-/* OpenFont flags */
-#define FontLoadInfo 0x0001
-#define FontLoadProps 0x0002
-#define FontLoadMetrics 0x0004
-#define FontLoadBitmaps 0x0008
-#define FontLoadAll 0x000f
-#define FontOpenSync 0x0010
-#define FontReopen 0x0020
-
-/* Query flags */
-#define LoadAll 0x1
-#define FinishRamge 0x2
-#define EightBitFont 0x4
-#define SixteenBitFont 0x8
-
-/* Glyph Caching Modes */
-#define CACHING_OFF 0
-#define CACHE_16_BIT_GLYPHS 1
-#define CACHE_ALL_GLYPHS 2
-#define DEFAULT_GLYPH_CACHING_MODE CACHE_16_BIT_GLYPHS
-extern int glyphCachingMode;
-
-struct _Client;
-
-extern int StartListFontsWithInfo(
- struct _Client * /*client*/,
- int /*length*/,
- unsigned char * /*pattern*/,
- int /*max_names*/
-);
-
-extern FontNamesPtr MakeFontNamesRecord(
- unsigned /* size */
-);
-
-extern void FreeFontNames(
- FontNamesPtr /* pFN*/
-);
-
-extern int AddFontNamesName(
- FontNamesPtr /* names */,
- char * /* name */,
- int /* length */
-);
-
-#if 0 /* unused */
-extern int FontToFSError();
-extern FontResolutionPtr GetClientResolution();
-#endif
-
-typedef struct _FontPatternCache *FontPatternCachePtr;
-
-extern FontPatternCachePtr MakeFontPatternCache (
- void
-);
-
-extern void FreeFontPatternCache (
- FontPatternCachePtr /* cache */
-);
-
-extern void EmptyFontPatternCache (
- FontPatternCachePtr /* cache */
-);
-
-extern void CacheFontPattern (
- FontPatternCachePtr /* cache */,
- char * /* pattern */,
- int /* patlen */,
- FontPtr /* pFont */
-);
-extern FontResolutionPtr GetClientResolutions(
- int * /* num */
-);
-
-extern FontPtr FindCachedFontPattern (
- FontPatternCachePtr /* cache */,
- char * /* pattern */,
- int /* patlen */
-);
-
-extern void RemoveCachedFontPattern (
- FontPatternCachePtr /* cache */,
- FontPtr /* pFont */
-);
-
-typedef enum {
- Linear8Bit, TwoD8Bit, Linear16Bit, TwoD16Bit
-} FontEncoding;
-
-#endif /* FONT_H */
diff --git a/nx-X11/include/fonts/fontproto.h b/nx-X11/include/fonts/fontproto.h
deleted file mode 100644
index 83c9a00c0..000000000
--- a/nx-X11/include/fonts/fontproto.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
-
-/***********************************************************
-
-Copyright (c) 1999 The XFree86 Project Inc.
-
-All Rights Reserved.
-
-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 XFree86 Project
-Inc. 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 XFree86 Project Inc..
-
-*/
-#ifndef _FONTPROTO_H
-#define _FONTPROTO_H
-
-/* Externally provided functions required by libXfont */
-
-extern int RegisterFPEFunctions ( NameCheckFunc name_func,
- InitFpeFunc init_func,
- FreeFpeFunc free_func,
- ResetFpeFunc reset_func,
- OpenFontFunc open_func,
- CloseFontFunc close_func,
- ListFontsFunc list_func,
- StartLfwiFunc start_lfwi_func,
- NextLfwiFunc next_lfwi_func,
- WakeupFpeFunc wakeup_func,
- ClientDiedFunc client_died,
- LoadGlyphsFunc load_glyphs,
- StartLaFunc start_list_alias_func,
- NextLaFunc next_list_alias_func,
- SetPathFunc set_path_func);
-
-extern int GetDefaultPointSize ( void );
-
-extern int init_fs_handlers ( FontPathElementPtr fpe,
- BlockHandlerProcPtr block_handler);
-extern void remove_fs_handlers ( FontPathElementPtr fpe,
- BlockHandlerProcPtr block_handler,
- Bool all );
-
-extern int client_auth_generation ( ClientPtr client );
-
-#ifndef ___CLIENTSIGNAL_DEFINED___
-#define ___CLIENTSIGNAL_DEFINED___
-extern Bool ClientSignal ( ClientPtr client );
-#endif /* ___CLIENTSIGNAL_DEFINED___ */
-
-extern void DeleteFontClientID ( Font id );
-extern Font GetNewFontClientID ( void );
-extern int StoreFontClientFont ( FontPtr pfont, Font id );
-extern void FontFileRegisterFpeFunctions ( void );
-extern void FontFileCheckRegisterFpeFunctions ( void );
-
-extern Bool XpClientIsBitmapClient ( ClientPtr client );
-extern Bool XpClientIsPrintClient( ClientPtr client, FontPathElementPtr fpe );
-extern void PrinterFontRegisterFpeFunctions ( void );
-
-extern void fs_register_fpe_functions ( void );
-extern void check_fs_register_fpe_functions ( void );
-
-/* util/private.c */
-extern FontPtr CreateFontRec (void);
-extern void DestroyFontRec (FontPtr font);
-extern Bool _FontSetNewPrivate (FontPtr /* pFont */,
- int /* n */,
- pointer /* ptr */);
-extern int AllocateFontPrivateIndex (void);
-extern void ResetFontPrivateIndex (void);
-
-/* Type1/t1funcs.c */
-extern void Type1RegisterFontFileFunctions(void);
-extern void CIDRegisterFontFileFunctions(void);
-
-/* Speedo/spfuncs.c */
-extern void SpeedoRegisterFontFileFunctions(void);
-
-/* FreeType/ftfuncs.c */
-extern void FreeTypeRegisterFontFileFunctions(void);
-
-#endif
diff --git a/nx-X11/include/fonts/fontstruct.h b/nx-X11/include/fonts/fontstruct.h
deleted file mode 100644
index 451ed6a12..000000000
--- a/nx-X11/include/fonts/fontstruct.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, 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 name of Digital 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.
-
-******************************************************************/
-/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
-
-#ifndef FONTSTR_H
-#define FONTSTR_H
-
-#include <X11/Xproto.h>
-#include "font.h"
-#include <X11/Xfuncproto.h>
-#include <X11/Xdefs.h>
-
-/*
- * This version of the server font data strucutre is only for describing
- * the in memory data structure. The file structure is not necessarily a
- * copy of this. That is up to the compiler and the OS layer font loading
- * machinery.
- */
-
-#define GLYPHPADOPTIONS 4 /* 1, 2, 4, or 8 */
-
-typedef struct _FontProp {
- long name;
- long value; /* assumes ATOM is not larger than INT32 */
-} FontPropRec;
-
-typedef struct _FontResolution {
- unsigned short x_resolution;
- unsigned short y_resolution;
- unsigned short point_size;
-} FontResolutionRec;
-
-typedef struct _ExtentInfo {
- DrawDirection drawDirection;
- int fontAscent;
- int fontDescent;
- int overallAscent;
- int overallDescent;
- int overallWidth;
- int overallLeft;
- int overallRight;
-} ExtentInfoRec;
-
-typedef struct _CharInfo {
- xCharInfo metrics; /* info preformatted for Queries */
- char *bits; /* pointer to glyph image */
-} CharInfoRec;
-
-/*
- * Font is created at font load time. It is specific to a single encoding.
- * e.g. not all of the glyphs in a font may be part of a single encoding.
- */
-
-typedef struct _FontInfo {
- unsigned short firstCol;
- unsigned short lastCol;
- unsigned short firstRow;
- unsigned short lastRow;
- unsigned short defaultCh;
- unsigned int noOverlap:1;
- unsigned int terminalFont:1;
- unsigned int constantMetrics:1;
- unsigned int constantWidth:1;
- unsigned int inkInside:1;
- unsigned int inkMetrics:1;
- unsigned int allExist:1;
- unsigned int drawDirection:2;
- unsigned int cachable:1;
- unsigned int anamorphic:1;
- short maxOverlap;
- short pad;
- xCharInfo maxbounds;
- xCharInfo minbounds;
- xCharInfo ink_maxbounds;
- xCharInfo ink_minbounds;
- short fontAscent;
- short fontDescent;
- int nprops;
- FontPropPtr props;
- char *isStringProp;
-} FontInfoRec;
-
-typedef struct _Font {
- int refcnt;
- FontInfoRec info;
- char bit;
- char byte;
- char glyph;
- char scan;
- fsBitmapFormat format;
- int (*get_glyphs) (FontPtr /* font */,
- unsigned long /* count */,
- unsigned char * /* chars */,
- FontEncoding /* encoding */,
- unsigned long * /* count */,
- CharInfoPtr * /* glyphs */);
- int (*get_metrics) (FontPtr /* font */,
- unsigned long /* count */,
- unsigned char * /* chars */,
- FontEncoding /* encoding */,
- unsigned long * /* count */,
- xCharInfo ** /* glyphs */);
- void (*unload_font) (FontPtr /* font */);
- void (*unload_glyphs) (FontPtr /* font */);
- FontPathElementPtr fpe;
- pointer svrPrivate;
- pointer fontPrivate;
- pointer fpePrivate;
- int maxPrivate;
- pointer *devPrivates;
-} FontRec;
-
-#define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (pointer) 0 : \
- (pFont)->devPrivates[n])
-
-#define FontSetPrivate(pFont,n,ptr) ((n) > (pFont)->maxPrivate ? \
- _FontSetNewPrivate (pFont, n, ptr) : \
- ((((pFont)->devPrivates[n] = (ptr)) != 0) || TRUE))
-
-typedef struct _FontNames {
- int nnames;
- int size;
- int *length;
- char **names;
-} FontNamesRec;
-
-/* External view of font paths */
-typedef struct _FontPathElement {
- int name_length;
- char *name;
- int type;
- int refcount;
- pointer private;
-} FontPathElementRec;
-
-typedef Bool (*NameCheckFunc) (char *name);
-typedef int (*InitFpeFunc) (FontPathElementPtr fpe);
-typedef int (*FreeFpeFunc) (FontPathElementPtr fpe);
-typedef int (*ResetFpeFunc) (FontPathElementPtr fpe);
-typedef int (*OpenFontFunc) ( pointer client,
- FontPathElementPtr fpe,
- Mask flags,
- char* name,
- int namelen,
- fsBitmapFormat format,
- fsBitmapFormatMask fmask,
- XID id,
- FontPtr* pFont,
- char** aliasName,
- FontPtr non_cachable_font);
-typedef void (*CloseFontFunc) (FontPathElementPtr fpe, FontPtr pFont);
-typedef int (*ListFontsFunc) (pointer client,
- FontPathElementPtr fpe,
- char* pat,
- int len,
- int max,
- FontNamesPtr names);
-
-typedef int (*StartLfwiFunc) (pointer client,
- FontPathElementPtr fpe,
- char* pat,
- int len,
- int max,
- pointer* privatep);
-
-typedef int (*NextLfwiFunc) (pointer client,
- FontPathElementPtr fpe,
- char** name,
- int* namelen,
- FontInfoPtr* info,
- int* numFonts,
- pointer private);
-
-typedef int (*WakeupFpeFunc) (FontPathElementPtr fpe,
- unsigned long* LastSelectMask);
-
-typedef void (*ClientDiedFunc) (pointer client,
- FontPathElementPtr fpe);
-
-typedef int (*LoadGlyphsFunc) (pointer client,
- FontPtr pfont,
- Bool range_flag,
- unsigned int nchars,
- int item_size,
- unsigned char* data);
-
-typedef int (*StartLaFunc) (pointer client,
- FontPathElementPtr fpe,
- char* pat,
- int len,
- int max,
- pointer* privatep);
-
-typedef int (*NextLaFunc) (pointer client,
- FontPathElementPtr fpe,
- char** namep,
- int* namelenp,
- char** resolvedp,
- int* resolvedlenp,
- pointer private);
-
-typedef void (*SetPathFunc)(void);
-
-typedef struct _FPEFunctions {
- NameCheckFunc name_check;
- InitFpeFunc init_fpe;
- ResetFpeFunc reset_fpe;
- FreeFpeFunc free_fpe;
- OpenFontFunc open_font;
- CloseFontFunc close_font;
- ListFontsFunc list_fonts;
- StartLaFunc start_list_fonts_and_aliases;
- NextLaFunc list_next_font_or_alias;
- StartLfwiFunc start_list_fonts_with_info;
- NextLfwiFunc list_next_font_with_info;
- WakeupFpeFunc wakeup_fpe;
- ClientDiedFunc client_died;
- /* for load_glyphs, range_flag = 0 ->
- nchars = # of characters in data
- item_size = bytes/char
- data = list of characters
- range_flag = 1 ->
- nchars = # of fsChar2b's in data
- item_size is ignored
- data = list of fsChar2b's */
- LoadGlyphsFunc load_glyphs;
- SetPathFunc set_path_hook;
-} FPEFunctionsRec, FPEFunctions;
-
-/*
- * Various macros for computing values based on contents of
- * the above structures
- */
-
-#define GLYPHWIDTHPIXELS(pci) \
- ((pci)->metrics.rightSideBearing - (pci)->metrics.leftSideBearing)
-
-#define GLYPHHEIGHTPIXELS(pci) \
- ((pci)->metrics.ascent + (pci)->metrics.descent)
-
-#define GLYPHWIDTHBYTES(pci) (((GLYPHWIDTHPIXELS(pci))+7) >> 3)
-
-#define GLYPHWIDTHPADDED(bc) (((bc)+7) & ~0x7)
-
-#define BYTES_PER_ROW(bits, nbytes) \
- ((nbytes) == 1 ? (((bits)+7)>>3) /* pad to 1 byte */ \
- :(nbytes) == 2 ? ((((bits)+15)>>3)&~1) /* pad to 2 bytes */ \
- :(nbytes) == 4 ? ((((bits)+31)>>3)&~3) /* pad to 4 bytes */ \
- :(nbytes) == 8 ? ((((bits)+63)>>3)&~7) /* pad to 8 bytes */ \
- : 0)
-
-#define BYTES_FOR_GLYPH(ci,pad) (GLYPHHEIGHTPIXELS(ci) * \
- BYTES_PER_ROW(GLYPHWIDTHPIXELS(ci),pad))
-/*
- * Macros for computing different bounding boxes for fonts; from
- * the font protocol
- */
-
-#define FONT_MAX_ASCENT(pi) ((pi)->fontAscent > (pi)->ink_maxbounds.ascent ? \
- (pi)->fontAscent : (pi)->ink_maxbounds.ascent)
-#define FONT_MAX_DESCENT(pi) ((pi)->fontDescent > (pi)->ink_maxbounds.descent ? \
- (pi)->fontDescent : (pi)->ink_maxbounds.descent)
-#define FONT_MAX_HEIGHT(pi) (FONT_MAX_ASCENT(pi) + FONT_MAX_DESCENT(pi))
-#define FONT_MIN_LEFT(pi) ((pi)->ink_minbounds.leftSideBearing < 0 ? \
- (pi)->ink_minbounds.leftSideBearing : 0)
-#define FONT_MAX_RIGHT(pi) ((pi)->ink_maxbounds.rightSideBearing > \
- (pi)->ink_maxbounds.characterWidth ? \
- (pi)->ink_maxbounds.rightSideBearing : \
- (pi)->ink_maxbounds.characterWidth)
-#define FONT_MAX_WIDTH(pi) (FONT_MAX_RIGHT(pi) - FONT_MIN_LEFT(pi))
-
-#include "fontproto.h"
-
-#endif /* FONTSTR_H */
diff --git a/nx-X11/include/fonts/fsmasks.h b/nx-X11/include/fonts/fsmasks.h
deleted file mode 100644
index 434ee97b5..000000000
--- a/nx-X11/include/fonts/fsmasks.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
-/*
- * Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
- *
- * 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 names of Network Computing Devices or Digital
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- * Network Computing Devices and Digital make no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES
- * OR 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.
- */
-
-/*
-
-Portions Copyright 1987, 1994, 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.
-
-*/
-
-
-/*
- * masks & values used by the font lib and the font server
- */
-
-#ifndef _FSMASKS_H_
-#define _FSMASKS_H_
-
-#include <X11/Xmd.h>
-
-/* font format macros */
-#define BitmapFormatByteOrderMask (1L << 0)
-#define BitmapFormatBitOrderMask (1L << 1)
-#define BitmapFormatImageRectMask (3L << 2)
-#define BitmapFormatScanlinePadMask (3L << 8)
-#define BitmapFormatScanlineUnitMask (3L << 12)
-
-#define BitmapFormatByteOrderLSB (0)
-#define BitmapFormatByteOrderMSB (1L << 0)
-#define BitmapFormatBitOrderLSB (0)
-#define BitmapFormatBitOrderMSB (1L << 1)
-
-#define BitmapFormatImageRectMin (0L << 2)
-#define BitmapFormatImageRectMaxWidth (1L << 2)
-#define BitmapFormatImageRectMax (2L << 2)
-
-#define BitmapFormatScanlinePad8 (0L << 8)
-#define BitmapFormatScanlinePad16 (1L << 8)
-#define BitmapFormatScanlinePad32 (2L << 8)
-#define BitmapFormatScanlinePad64 (3L << 8)
-
-#define BitmapFormatScanlineUnit8 (0L << 12)
-#define BitmapFormatScanlineUnit16 (1L << 12)
-#define BitmapFormatScanlineUnit32 (2L << 12)
-#define BitmapFormatScanlineUnit64 (3L << 12)
-
-#define BitmapFormatMaskByte (1L << 0)
-#define BitmapFormatMaskBit (1L << 1)
-#define BitmapFormatMaskImageRectangle (1L << 2)
-#define BitmapFormatMaskScanLinePad (1L << 3)
-#define BitmapFormatMaskScanLineUnit (1L << 4)
-
-typedef CARD32 fsBitmapFormat;
-typedef CARD32 fsBitmapFormatMask;
-
-#endif /* _FSMASKS_H_ */