[stsf-commit]
stsf/interface stprivate.h, 1.1, 1.2 sttypes.tmpl, 1.7, 1.8
Alexander Gelfenbain
stsf-commit at pdx.freedesktop.org
Sun May 30 16:07:20 PDT 2004
- Previous message: [stsf-commit] stsf/STFontServer/src fontenumerator.c, 1.3,
1.4 fontserver.c, 1.4, 1.5 handler.c, 1.6, 1.7 handler.h, 1.2,
1.3 saverestore.c, 1.4, 1.5 stfs-door.c, 1.7, 1.8 stpfc.c, 1.2, 1.3
- Next message: [stsf-commit] stsf/stsflib fscomm.c, 1.4, 1.5 fscomm.h, 1.3,
1.4 stsfutil.c, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: adg
Index: stprivate.h
===================================================================
RCS file: /cvs/stsf/stsf/interface/stprivate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/stprivate.h 25 May 2004 02:47:25 -0000 1.1
+++ b/stprivate.h 30 May 2004 23:07:17 -0000 1.2
@@ -107,21 +107,11 @@
* Control allocatation of additional entries in the bfontarray when the array needs to grow
* n = (FENUM_FINCRA + 1) * <delta> + FENUM_FINCRB;
*
- * TEMP_FONT_DIR "/var/tmp/stsf/fonts" fontserver.c
- * Directory where session fonts are stored.
- *
* TEMP_PATTERN "XXXXXX" fontserver.c
* Temporary font file name pattern
*
* STSF_TEMPDIR "/var/tmp/stsf" stsf-door.c
- * Root directory for STSF temporary files (PFC and session fonts)
- *
- * PFC_DIR N/A saverestore.c
- * Directory where persistent font cache is stored
- *
- * PFC_FILE N/A saverestore.c
- * Persistent font cache filename
- *
+ * Root directory for STSF temporary files
*
* PROTO_BUFSIZE N/A stfs.c
* size of a per-connection protocol receive buffer
@@ -180,29 +170,24 @@
/* #define FENUM_BINCRA 0.0 */
/* #define FENUM_BINCRB 200 */
/* #define MAX_URL_COUNT 50 */
-/* #define TEMP_FONT_DIR "/var/tmp/stsf/fonts" */
/* #define TEMP_PATTERN "XXXXXX" */
#ifdef SOLARIS_DOORS
-#define TEMP_FONT_DIR "/var/tmp/stsf/doors"
#define TEMP_DOOR_PATTERN "XXXXXX"
#endif
#define STSF_TEMPDIR "/var/tmp/stsf"
-/* XXX For consistency replace PFC_DIR and PFC_FILE with PFC_FILENAME to avoid calling JoinPath() all over the place */
+#define STSF_TEMPFONTDIR STSF_TEMPDIR "/fonts"
+#define PFC_FILENAME STSF_TEMPDIR "/stsf.pfc"
-#define PFC_DIR "/var/tmp/stsf"
-#define PFC_FILE "stsf.pfc"
-#define PFC_FILENAME "/var/tmp/stsf/stsf.pfc" /* JoinPath(PFC_DIR, PFC_FILE) */
#define PROTO_BUFSIZE 65536
#define PROTO_MAXBUFSIZE 65536 * 4
#define NCID 64
#define STFS_DOOR "/var/run/stsf_door"
-#define SHMEM_DIR "/var/tmp/stsf/shmem"
#define SHMEM_PATTERN "XXXXXX"
#define SHMEM_SIZE 1024*1024 /* 1M per client */
#define SHMEM_PROTO 128*1024 /* 128K per client */
Index: sttypes.tmpl
===================================================================
RCS file: /cvs/stsf/stsf/interface/sttypes.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/sttypes.tmpl 25 May 2004 02:47:25 -0000 1.7
+++ b/sttypes.tmpl 30 May 2004 23:07:18 -0000 1.8
@@ -413,24 +413,6 @@
/**
* STFontMetrics struct
*/
-#if 0
-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, *STFontMetricsPtr;
-#endif
-
typedef struct {
double hAscent; /**< horizontal ascender */
- Previous message: [stsf-commit] stsf/STFontServer/src fontenumerator.c, 1.3,
1.4 fontserver.c, 1.4, 1.5 handler.c, 1.6, 1.7 handler.h, 1.2,
1.3 saverestore.c, 1.4, 1.5 stfs-door.c, 1.7, 1.8 stpfc.c, 1.2, 1.3
- Next message: [stsf-commit] stsf/stsflib fscomm.c, 1.4, 1.5 fscomm.h, 1.3,
1.4 stsfutil.c, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the stsf-commit
mailing list