[stsf-commit]
stsf/interface VERSION, NONE, 1.1 genversion.py, NONE,
1.1 stprivate.h, NONE, 1.1 fontserver.h, 1.3, 1.4 makefile,
1.5, 1.6 sttypes.tmpl, 1.6, 1.7 genproto.py, 1.3,
NONE genstsf.py, 1.1.1.1, NONE interface.xml, 1.5,
NONE protocol.xml, 1.5, NONE stprivate.tmpl, 1.2, NONE
Alexander Gelfenbain
stsf-commit at pdx.freedesktop.org
Mon May 24 19:47:27 PDT 2004
- Previous message: [stsf-commit] stsf/STFontServer/src handler.c, 1.3, 1.4 handler.h,
1.1.1.1, 1.2 makefile, 1.6, 1.7 saverestore.c, 1.3,
1.4 stfs-door.c, 1.4, 1.5 stfs.h, 1.2, 1.3
- Next message: [stsf-commit] stsf/stsflib fscomm.c, 1.2, 1.3 fscomm.h, 1.2,
1.3 stsfutil.c, 1.8, 1.9 stsfutil.h, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: adg
--- NEW FILE: VERSION ---
#
# STSF Version Constants
#
major: 0
minor: 8
update: 7
--- NEW FILE: genversion.py ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: stprivate.h ---
(This appears to be a binary file; contents omitted.)
Index: fontserver.h
===================================================================
RCS file: /cvs/stsf/stsf/interface/fontserver.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/fontserver.h 12 Apr 2004 05:57:26 -0000 1.3
+++ b/fontserver.h 25 May 2004 02:47:25 -0000 1.4
@@ -60,54 +60,20 @@
/**
* STFontServer API
+ *
+ *
+ * NOTE
+ * All STFontServer API functions that take utf16 * argument expect the number
+ * of UTF16 data elements as the string length, which is not the proper number
+ * of UTF16 characters. STClientLibrary is supposed to take care of the conversion.
+ *
*/
#ifdef __cplusplus
extern "C" {
#endif
-#if 0
- /**
- * Defines STFontServer-specific font types
- */
- typedef enum {
- ftUnknown = 0, /**< Reserved */
- ftTrueType, /**< Classic TrueType */
- ftType1A, /**< Type1 - PFA */
- ftType1B, /**< Type1 - PFB */
- ftOpenType, /**< OpenType, TrueType open - TTF and OTF */
- ftTrueTypeGX, /**< TrueType with GX extensions */
- ftEOT, /**< Embedded OpenType */
- ftT2K, /**< FontFusion T2K format, Asian and Roman */
- ftPFR, /**< TrueDoc PFR font */
- ftIntelliFont, /**< Intellifont */
- ftSpeedo /**< Speedo */
- } STFontServerFontType;
-#endif
-
-#if 0 /* REMOVE AS SOON AS POSSIBLE */
- /**
- * ST Font Server - specific font types.
- * Scalable font types are identical to ST font types.
- * Bitmap font types are private to the font server and are
- * never exposed to the client library
- */
-
-#define STFS_UNKNOWN_FONT ST_UNKNOWN_FONT /**< Reserved */
-#define STFS_TRUETYPE /**< Classic TrueType */
-#define STFS_TYPE1 ST_TYPE1 /**< Type1 */
-#define STFS_OPENTYPE_TTF ST_OPENTYPE_TTF /**< OpenType, TrueType open - TTF */
-#define STFS_OPENTYPE_OTF ST_OPENTYPE_OTF /**< OpenType - OTF */
-#define STFS_TRUETYPE_GX STFS_TRUETYPE_GX /**< TrueType with GX extensions */
-#define STFS_EOT ST_EOT /**< Embedded OpenType */
-#define STFS_T2K ST_T2K /**< FontFusion T2K format, Asian and Roman */
-#define STFS_PFR ST_PFR /**< TrueDoc PFR font */
-#define STFS_INTELLIFONT ST_INTELLIFONT /**< Intellifont */
-#define STFS_SPEEDO ST_SPEEDO /**< Speedo */
-
-#define STFS_PCF 65536 /**< X11 PCF font format */
-#endif
/* private font types */
@@ -135,32 +101,6 @@
double hlinegap, vlinegap;
} FSFontInfo, *FSFontInfoPtr;
- /* *** Moved to sttypes.h
- typedef struct {
- F16Dot16 xx;
- F16Dot16 xy;
- F16Dot16 yx;
- F16Dot16 yy;
- } TMatrix, *TMatrixPtr;
- */
-
-
- /* Font instance rendering flags */
- typedef enum {
- fEnableSbits = 0x00000001, /* DEPRECATED */
- fEnableHints = 0x00000002, /* DEPRECATED */
- fEnableAutoHinting = 0x00000004, /* DEPRECATED */
- fBlackAndWhite = 0x00000008, /* DEPRECATED */
- fGrayScaleMode = 0x00000010, /* DEPRECATED */
- fGreyScaleMode = fGrayScaleMode, /* DEPRECATED */
- fLCDOptimizedMode = 0x00000020, /* DEPRECATED */
- fVertical = 0x00010000 /* DEPRECATED */
- } FSRenderFlags_DEPRECATED;
-
-
-
-
-
typedef struct {
F16Dot16 xh, yh; /* Kerning vector for horisontal writing mode */
Index: makefile
===================================================================
RCS file: /cvs/stsf/stsf/interface/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/makefile 12 Apr 2004 22:49:25 -0000 1.5
+++ b/makefile 25 May 2004 02:47:25 -0000 1.6
@@ -45,21 +45,11 @@
HEADER_FILES= st.h sttypes.h stprivate.h
-all: sttypes.h stprivate.h sizeof.xml stfsproto.c stfsproto.h
-
-sttypes.h stprivate.h sizegen.c : sttypes.tmpl stprivate.tmpl interface.xml genstsf.py
- chmod +x genstsf.py && ./genstsf.py
-
-sizeof.xml: genstsf.py sttypes.h stprivate.h sizegen sizegen.c
- rm -f sizeof.xml
- ./sizegen > sizeof.xml
-
-stfsproto.c stfsproto.h : genproto.py sizeof.xml protocol.xml
- chmod +x genproto.py && ./genproto.py
+all: sttypes.h
-sizegen.o: sizegen.c
+sttypes.h : sttypes.tmpl genversion.py
+ chmod +x genversion.py && ./genversion.py -r
-sizegen: sizegen.o
install: $(HEADER_FILES)
$(INSTALL_DIR) $(TARGETDIR)/include
@@ -80,12 +70,10 @@
clean clean-all::
rm -f *.o *.d *.so *.so.1 *~ *core *.a *_pure*
- rm -f
- rm -f sizegen sizegen.c sizeof.xml
+ rm -f sttypes.h
clean-all::
- rm -f stfsproto.c stfsproto.h
- rm -f stprivate.h sttypes.h config.h
+ rm -f config.h
Index: sttypes.tmpl
===================================================================
RCS file: /cvs/stsf/stsf/interface/sttypes.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/sttypes.tmpl 1 May 2004 01:54:26 -0000 1.6
+++ b/sttypes.tmpl 25 May 2004 02:47:25 -0000 1.7
@@ -372,6 +372,7 @@
#define ST_OM_RASTER_GREYSCALE ST_OM_RASTER_GRAYSCALE /**< Anti-aliased mode */
#define ST_OM_RASTER_LCD 3 /**< Optimized for LCD output */
#define ST_OM_RASTER_TV 4 /**< Optimized for TV output */
+#define ST_OM_RASTER_MONO_BITSWAPPED 5 /**< Two-color rendering */
#define ST_OM_VECTOR 32 /**< Vector based output */
#define ST_OF_SUPPRESS_FRACTIONAL_METRICS 0x00010000 /**< Do not use fractional metrics */
@@ -430,7 +431,24 @@
} STFontMetrics, *STFontMetricsPtr;
#endif
-%STFontMetrics%
+
+typedef struct {
+ double hAscent; /**< horizontal ascender */
+ double hDescent; /**< horizontal descender */
+ double hLeading; /**< horizontal leading */
+ double vAscent; /**< vertical ascender */
+ double vDescent; /**< vertical descender */
+ double vLeading; /**< vertical leading */
+ double italicAngle; /**< italic angle in radians */
+ double xMin; /**< top left corner of bounding box */
+ double yMin; /**< top left corner of bounding box */
+ double xMax; /**< bottom right corner of bounding box */
+ double yMax; /**< bottom right corner of bounding box */
+ int widthClass; /**< value from 1 to 9 */
+ int weightClass; /**< value from 100 to 900 */
+} STFontMetrics;
+
+
typedef STFontMetrics *STFontMetricsPtr;
@@ -520,7 +538,17 @@
} STMatrix, *STMatrixPtr;
#endif
-%STMatrix%
+
+typedef struct {
+ double xx; /**< transformation matrix value */
+ double xy; /**< transformation matrix value */
+ double yx; /**< transformation matrix value */
+ double yy; /**< transformation matrix value */
+ double tx; /**< transformation matrix value for x translation */
+ double ty; /**< transformation matrix value for y translation */
+} STMatrix;
+
+
typedef STMatrix *STMatrixPtr;
@@ -714,7 +742,13 @@
} STLookupTable;
#endif
-%STLookupTable%
+
+typedef struct {
+ int n; /**< Number of entries in c array */
+ uint32_t c[256]; /**< Array of RGB colors */
+} STLookupTable;
+
+
/**
* Rendering parameters
--- genproto.py DELETED ---
--- genstsf.py DELETED ---
--- interface.xml DELETED ---
--- protocol.xml DELETED ---
--- stprivate.tmpl DELETED ---
- Previous message: [stsf-commit] stsf/STFontServer/src handler.c, 1.3, 1.4 handler.h,
1.1.1.1, 1.2 makefile, 1.6, 1.7 saverestore.c, 1.3,
1.4 stfs-door.c, 1.4, 1.5 stfs.h, 1.2, 1.3
- Next message: [stsf-commit] stsf/stsflib fscomm.c, 1.2, 1.3 fscomm.h, 1.2,
1.3 stsfutil.c, 1.8, 1.9 stsfutil.h, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the stsf-commit
mailing list