0de2b40220
* install startup file * create TrueType directory * add new --notcp option (from ports/21957) and document it See PR for complete details PR: 22946 Submitted by: maintainer
82 lines
2.7 KiB
Plaintext
82 lines
2.7 KiB
Plaintext
--- xfstt.cpp.orig Sat Dec 11 19:23:45 1999
|
|
+++ xfstt.cpp Sat Nov 18 15:57:30 2000
|
|
@@ -11,8 +11,8 @@
|
|
#define UNSTRAPLIMIT 10500U
|
|
|
|
// Change these if you don't lie being FHS complient
|
|
-#define TTFONTDIR "/usr/share/fonts/truetype"
|
|
-#define TTCACHEDIR "/var/cache/xfstt"
|
|
+#define TTFONTDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
|
+#define TTCACHEDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
|
|
|
#define TTINFO_LEAF "ttinfo.dir"
|
|
#define TTNAME_LEAF "ttname.dir"
|
|
@@ -73,6 +73,7 @@
|
|
char* fontdir = TTFONTDIR;
|
|
char* cachedir = TTCACHEDIR;
|
|
int defaultres = 0;
|
|
+int NoTCP = 0;
|
|
|
|
uid_t newuid = (uid_t)(-2);
|
|
gid_t newgid = (uid_t)(-2);
|
|
@@ -95,6 +96,7 @@
|
|
printf( "\t--sync put ttf-fonts in \"%s\" in database\n", fontdir);
|
|
printf( "\t--gslist print ghostscript style ttf fontlist\n ");
|
|
printf( "\t--port change port number from default 7101\n");
|
|
+ printf( "\t--notcp don't open TCP socket, use unix domain only\n");
|
|
printf( "\t--dir use other font directory than "TTFONTDIR"\n");
|
|
printf( "\t--cache use other font cache directory than "TTCACHEDIR"\n");
|
|
printf( "\t--res force default resolution to this value\n");
|
|
@@ -470,10 +472,12 @@
|
|
raster->getFontExtent( &xfs->fe);
|
|
|
|
int used = (xfs->fe.bitmaps + xfs->fe.bmplen) - xfs->fe.buffer;
|
|
+ int bmpoff = xfs->fe.bitmaps - xfs->fe.buffer;
|
|
xfs->fe.buffer = (U8*)shrinkMem( xfs->fe.buffer, used);
|
|
- if( xfs->fe.buffer)
|
|
+ if( xfs->fe.buffer) {
|
|
xfs->fe.buflen = used;
|
|
- else {
|
|
+ xfs->fe.bitmaps = xfs->fe.buffer + bmpoff;
|
|
+ } else {
|
|
xfs->fid = 0; //###
|
|
xfs = 0;
|
|
}
|
|
@@ -652,7 +656,7 @@
|
|
listen( sd_unix, 1); // only one connection
|
|
}
|
|
|
|
- if( !sd_inet) {
|
|
+ if( !NoTCP && !sd_inet) {
|
|
// prepare inet connection
|
|
sd_inet = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP);
|
|
|
|
@@ -668,7 +672,8 @@
|
|
fd_set sdlist;
|
|
FD_ZERO( &sdlist);
|
|
FD_SET( sd_unix, &sdlist);
|
|
- FD_SET( sd_inet, &sdlist);
|
|
+ if( !NoTCP )
|
|
+ FD_SET( sd_inet, &sdlist);
|
|
int maxsd = (sd_inet > sd_unix) ? sd_inet : sd_unix;
|
|
select( maxsd+1, &sdlist, 0L, 0L, 0L);
|
|
|
|
@@ -676,7 +681,7 @@
|
|
unsigned int saLength = sizeof(struct sockaddr);
|
|
if( FD_ISSET( sd_unix, &sdlist))
|
|
sd = accept( sd_unix, (struct sockaddr*)&s_unix, &saLength);
|
|
- else if( FD_ISSET( sd_inet, &sdlist))
|
|
+ else if( !NoTCP && FD_ISSET( sd_inet, &sdlist))
|
|
sd = accept( sd_inet, (struct sockaddr*)&s_inet, &saLength);
|
|
dprintf2( "accept( saLength = %d) = %d\n", saLength, sd);
|
|
|
|
@@ -1604,6 +1609,8 @@
|
|
inetdConnection = 1;
|
|
} else if( !strcmp( argv[i], "--multi")) {
|
|
multiConnection = 1;
|
|
+ } else if( !strcmp( argv[i], "--notcp")) {
|
|
+ NoTCP = 1;
|
|
} else if( !strcmp( argv[i], "--once")) {
|
|
multiConnection = 0;
|
|
} else if( !strcmp( argv[i], "--unstrap")) {
|