Synchronised line endinge with release branch

1 files changed, 200 insertions, 200 deletions

diff --git a/libXfont/src/fc/fservestr.h b/libXfont/src/fc/fservestr.h
index 90f17c29e..a6d0d1d53 100644
--- a/libXfont/src/fc/fservestr.h
+++ b/libXfont/src/fc/fservestr.h
@@ -1,200 +1,200 @@
-/*

- * Copyright 1990 Network Computing Devices

- *

- * 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 Network Computing Devices not be

- * used in advertising or publicity pertaining to distribution of the

- * software without specific, written prior permission.  Network Computing

- * Devices makes no representations about the suitability of this software

- * for any purpose.  It is provided "as is" without express or implied

- * warranty.

- *

- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,

- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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:  	Dave Lemke, Network Computing Devices, Inc

- */

-

-#ifndef _FSERVESTR_H_

-#define _FSERVESTR_H_

-

-#include	"fserve.h"

-#include	"fsio.h"

-

-/*

- * font server data structures

- */

-/*

- * font server private storage

- */

-

-typedef struct _fs_glyph {

-    struct _fs_glyph	*next;

-} FSGlyphRec, *FSGlyphPtr;

-

-typedef struct _fs_font {

-    CharInfoPtr pDefault;

-    CharInfoPtr encoding;

-    CharInfoPtr inkMetrics;

-    FSGlyphPtr	glyphs;

-}           FSFontRec, *FSFontPtr;

-

-/* FS special data for the font */

-typedef struct _fs_font_data {

-    long        fontid;

-    int		generation;	/* FS generation when opened */

-    unsigned long glyphs_to_get;	/* # glyphs remaining to be gotten */

-

-    /* Following data needed in case font needs to be reopened. */

-    int		namelen;

-    char       *name;

-    fsBitmapFormat	format;

-    fsBitmapFormatMask	fmask;

-}           FSFontDataRec;

-

-typedef struct fs_clients_depending {

-    pointer	client;

-    struct fs_clients_depending *next;

-}	FSClientsDependingRec, *FSClientsDependingPtr;

-

-/* OpenFont specific data for blocked request */

-typedef struct _fs_blocked_font {

-    FontPtr     pfont;		/* must be first for fs_read_glyphs */

-    long        fontid;

-    int         state;		/* how many of the replies have landed */

-    int         flags;

-    Bool	freeFont;	/* free this font on failure */

-    CARD16	queryInfoSequence;

-    CARD16	queryExtentsSequence;

-    CARD16	queryBitmapsSequence;

-    fsBitmapFormat format;

-    FSClientsDependingPtr	clients_depending;

-}           FSBlockedFontRec;

-

-/* LoadGlyphs data for blocked request */

-typedef struct _fs_blocked_glyphs {

-    FontPtr     pfont;		/* must be first for fs_read_glyphs */

-    int		num_expected_ranges;

-    fsRange     *expected_ranges;

-    FSClientsDependingPtr	clients_depending;

-}           FSBlockedGlyphRec;

-

-/* LoadExtents data for blocked request */

-typedef struct _fs_blocked_extents {

-    FontPtr     pfont;

-    fsRange    *expected_ranges;

-    int         nranges;

-    unsigned long nextents;

-    fsXCharInfo *extents;

-}           FSBlockedExtentRec;

-

-/* LoadBitmaps data for blocked request */

-typedef struct _fs_blocked_bitmaps {

-    FontPtr     pfont;

-    fsRange    *expected_ranges;

-    int         nranges;

-    unsigned long size;

-    unsigned long nglyphs;

-    fsOffset32   *offsets;

-    pointer     gdata;

-}           FSBlockedBitmapRec;

-

-/* state for blocked ListFonts */

-typedef struct _fs_blocked_list {

-    FontNamesPtr names;

-}           FSBlockedListRec;

-

-/* state for blocked ListFontsWithInfo */

-typedef struct _fs_blocked_list_info {

-    int         status;

-    int         namelen;

-    FontInfoRec info;

-    char	name[256];

-    int         remaining;

-}           FSBlockedListInfoRec;

-

-/* state for blocked request */

-typedef struct _fs_block_data {

-    int			    type;	    /* Open Font, LoadGlyphs, ListFonts,

-					     * ListWithInfo */

-    pointer		    client;	    /* who wants it */

-    CARD16    		    sequenceNumber; /* expected */

-    pointer		    data;	    /* type specific data */

-    int			    errcode;	    /* Suspended, et al. */

-    struct _fs_block_data   *depending;	    /* clients depending on this one */

-    struct _fs_block_data   *next;

-}           FSBlockDataRec;

-

-/* state for reconnected to dead font server */

-typedef struct _fs_reconnect {

-    int	    i;

-} FSReconnectRec, *FSReconnectPtr;

-

-

-#if !defined(UNIXCPP) || defined(ANSICPP)

-#define fsCat(x,y) x##_##y

-#else

-#define fsCat(x,y) x/**/_/**/y

-#endif

-

-

-/* copy XCharInfo parts of a protocol reply into a xCharInfo */

-

-#define fsUnpack_XCharInfo(packet, structure) \

-    (structure)->leftSideBearing = fsCat(packet,left); \

-    (structure)->rightSideBearing = fsCat(packet,right); \

-    (structure)->characterWidth = fsCat(packet,width); \

-    (structure)->ascent = fsCat(packet,ascent); \

-    (structure)->descent = fsCat(packet,descent); \

-    (structure)->attributes = fsCat(packet,attributes)

-

-

-/* copy XFontInfoHeader parts of a protocol reply into a FontInfoRec */

-

-#define fsUnpack_XFontInfoHeader(packet, structure) \

-    (structure)->allExist = ((packet)->font_header_flags & FontInfoAllCharsExist) != 0; \

-    (structure)->drawDirection = \

-        ((packet)->font_header_draw_direction == LeftToRightDrawDirection) ? \

-	LeftToRight : RightToLeft; \

-    (structure)->inkInside = ((packet)->font_header_flags & FontInfoInkInside) != 0; \

- \

-    (structure)->firstRow = (packet)->font_hdr_char_range_min_char_high; \

-    (structure)->firstCol = (packet)->font_hdr_char_range_min_char_low; \

-    (structure)->lastRow = (packet)->font_hdr_char_range_max_char_high; \

-    (structure)->lastCol = (packet)->font_hdr_char_range_max_char_low; \

-    (structure)->defaultCh = (packet)->font_header_default_char_low \

-                           + ((packet)->font_header_default_char_high << 8); \

- \

-    (structure)->fontDescent = (packet)->font_header_font_descent; \

-    (structure)->fontAscent = (packet)->font_header_font_ascent; \

- \

-    fsUnpack_XCharInfo((packet)->font_header_min_bounds, &(structure)->minbounds); \

-    fsUnpack_XCharInfo((packet)->font_header_min_bounds, &(structure)->ink_minbounds); \

-    fsUnpack_XCharInfo((packet)->font_header_max_bounds, &(structure)->maxbounds); \

-    fsUnpack_XCharInfo((packet)->font_header_max_bounds, &(structure)->ink_maxbounds)

-

-extern void _fs_init_fontinfo ( FSFpePtr conn, FontInfoPtr pfi );

-extern int _fs_convert_props ( fsPropInfo *pi, fsPropOffset *po, pointer pd, 

-			       FontInfoPtr pfi );

-extern int _fs_convert_lfwi_reply ( FSFpePtr conn, FontInfoPtr pfi, 

-				    fsListFontsWithXInfoReply *fsrep, 

-				    fsPropInfo *pi, fsPropOffset *po, 

-				    pointer pd );

-extern int fs_build_range ( FontPtr pfont, Bool range_flag, 

-			    unsigned int count, int item_size, 

-			    unsigned char *data, int *nranges, 

-			    fsRange **ranges );

-extern void _fs_clean_aborted_loadglyphs ( FontPtr pfont, 

-					   int num_expected_ranges, 

-					   fsRange *expected_ranges );

-extern void _fs_init_font ( FontPtr pfont );

-extern pointer fs_alloc_glyphs (FontPtr pFont, int size);

-#endif				/* _FSERVESTR_H_ */

+/*
+ * Copyright 1990 Network Computing Devices
+ *
+ * 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 Network Computing Devices not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  Network Computing
+ * Devices makes no representations about the suitability of this software
+ * for any purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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:  	Dave Lemke, Network Computing Devices, Inc
+ */
+
+#ifndef _FSERVESTR_H_
+#define _FSERVESTR_H_
+
+#include	"fserve.h"
+#include	"fsio.h"
+
+/*
+ * font server data structures
+ */
+/*
+ * font server private storage
+ */
+
+typedef struct _fs_glyph {
+    struct _fs_glyph	*next;
+} FSGlyphRec, *FSGlyphPtr;
+
+typedef struct _fs_font {
+    CharInfoPtr pDefault;
+    CharInfoPtr encoding;
+    CharInfoPtr inkMetrics;
+    FSGlyphPtr	glyphs;
+}           FSFontRec, *FSFontPtr;
+
+/* FS special data for the font */
+typedef struct _fs_font_data {
+    long        fontid;
+    int		generation;	/* FS generation when opened */
+    unsigned long glyphs_to_get;	/* # glyphs remaining to be gotten */
+
+    /* Following data needed in case font needs to be reopened. */
+    int		namelen;
+    char       *name;
+    fsBitmapFormat	format;
+    fsBitmapFormatMask	fmask;
+}           FSFontDataRec;
+
+typedef struct fs_clients_depending {
+    pointer	client;
+    struct fs_clients_depending *next;
+}	FSClientsDependingRec, *FSClientsDependingPtr;
+
+/* OpenFont specific data for blocked request */
+typedef struct _fs_blocked_font {
+    FontPtr     pfont;		/* must be first for fs_read_glyphs */
+    long        fontid;
+    int         state;		/* how many of the replies have landed */
+    int         flags;
+    Bool	freeFont;	/* free this font on failure */
+    CARD16	queryInfoSequence;
+    CARD16	queryExtentsSequence;
+    CARD16	queryBitmapsSequence;
+    fsBitmapFormat format;
+    FSClientsDependingPtr	clients_depending;
+}           FSBlockedFontRec;
+
+/* LoadGlyphs data for blocked request */
+typedef struct _fs_blocked_glyphs {
+    FontPtr     pfont;		/* must be first for fs_read_glyphs */
+    int		num_expected_ranges;
+    fsRange     *expected_ranges;
+    FSClientsDependingPtr	clients_depending;
+}           FSBlockedGlyphRec;
+
+/* LoadExtents data for blocked request */
+typedef struct _fs_blocked_extents {
+    FontPtr     pfont;
+    fsRange    *expected_ranges;
+    int         nranges;
+    unsigned long nextents;
+    fsXCharInfo *extents;
+}           FSBlockedExtentRec;
+
+/* LoadBitmaps data for blocked request */
+typedef struct _fs_blocked_bitmaps {
+    FontPtr     pfont;
+    fsRange    *expected_ranges;
+    int         nranges;
+    unsigned long size;
+    unsigned long nglyphs;
+    fsOffset32   *offsets;
+    pointer     gdata;
+}           FSBlockedBitmapRec;
+
+/* state for blocked ListFonts */
+typedef struct _fs_blocked_list {
+    FontNamesPtr names;
+}           FSBlockedListRec;
+
+/* state for blocked ListFontsWithInfo */
+typedef struct _fs_blocked_list_info {
+    int         status;
+    int         namelen;
+    FontInfoRec info;
+    char	name[256];
+    int         remaining;
+}           FSBlockedListInfoRec;
+
+/* state for blocked request */
+typedef struct _fs_block_data {
+    int			    type;	    /* Open Font, LoadGlyphs, ListFonts,
+					     * ListWithInfo */
+    pointer		    client;	    /* who wants it */
+    CARD16    		    sequenceNumber; /* expected */
+    pointer		    data;	    /* type specific data */
+    int			    errcode;	    /* Suspended, et al. */
+    struct _fs_block_data   *depending;	    /* clients depending on this one */
+    struct _fs_block_data   *next;
+}           FSBlockDataRec;
+
+/* state for reconnected to dead font server */
+typedef struct _fs_reconnect {
+    int	    i;
+} FSReconnectRec, *FSReconnectPtr;
+
+
+#if !defined(UNIXCPP) || defined(ANSICPP)
+#define fsCat(x,y) x##_##y
+#else
+#define fsCat(x,y) x/**/_/**/y
+#endif
+
+
+/* copy XCharInfo parts of a protocol reply into a xCharInfo */
+
+#define fsUnpack_XCharInfo(packet, structure) \
+    (structure)->leftSideBearing = fsCat(packet,left); \
+    (structure)->rightSideBearing = fsCat(packet,right); \
+    (structure)->characterWidth = fsCat(packet,width); \
+    (structure)->ascent = fsCat(packet,ascent); \
+    (structure)->descent = fsCat(packet,descent); \
+    (structure)->attributes = fsCat(packet,attributes)
+
+
+/* copy XFontInfoHeader parts of a protocol reply into a FontInfoRec */
+
+#define fsUnpack_XFontInfoHeader(packet, structure) \
+    (structure)->allExist = ((packet)->font_header_flags & FontInfoAllCharsExist) != 0; \
+    (structure)->drawDirection = \
+        ((packet)->font_header_draw_direction == LeftToRightDrawDirection) ? \
+	LeftToRight : RightToLeft; \
+    (structure)->inkInside = ((packet)->font_header_flags & FontInfoInkInside) != 0; \
+ \
+    (structure)->firstRow = (packet)->font_hdr_char_range_min_char_high; \
+    (structure)->firstCol = (packet)->font_hdr_char_range_min_char_low; \
+    (structure)->lastRow = (packet)->font_hdr_char_range_max_char_high; \
+    (structure)->lastCol = (packet)->font_hdr_char_range_max_char_low; \
+    (structure)->defaultCh = (packet)->font_header_default_char_low \
+                           + ((packet)->font_header_default_char_high << 8); \
+ \
+    (structure)->fontDescent = (packet)->font_header_font_descent; \
+    (structure)->fontAscent = (packet)->font_header_font_ascent; \
+ \
+    fsUnpack_XCharInfo((packet)->font_header_min_bounds, &(structure)->minbounds); \
+    fsUnpack_XCharInfo((packet)->font_header_min_bounds, &(structure)->ink_minbounds); \
+    fsUnpack_XCharInfo((packet)->font_header_max_bounds, &(structure)->maxbounds); \
+    fsUnpack_XCharInfo((packet)->font_header_max_bounds, &(structure)->ink_maxbounds)
+
+extern void _fs_init_fontinfo ( FSFpePtr conn, FontInfoPtr pfi );
+extern int _fs_convert_props ( fsPropInfo *pi, fsPropOffset *po, pointer pd, 
+			       FontInfoPtr pfi );
+extern int _fs_convert_lfwi_reply ( FSFpePtr conn, FontInfoPtr pfi, 
+				    fsListFontsWithXInfoReply *fsrep, 
+				    fsPropInfo *pi, fsPropOffset *po, 
+				    pointer pd );
+extern int fs_build_range ( FontPtr pfont, Bool range_flag, 
+			    unsigned int count, int item_size, 
+			    unsigned char *data, int *nranges, 
+			    fsRange **ranges );
+extern void _fs_clean_aborted_loadglyphs ( FontPtr pfont, 
+					   int num_expected_ranges, 
+					   fsRange *expected_ranges );
+extern void _fs_init_font ( FontPtr pfont );
+extern pointer fs_alloc_glyphs (FontPtr pFont, int size);
+#endif				/* _FSERVESTR_H_ */