itlibdraw: handle larger number of subfonts - plan9port - [fork] Plan 9 from user space Err mx1.adamsgaard.dk 70 hgit clone git://src.adamsgaard.dk/plan9port URL:git://src.adamsgaard.dk/plan9port mx1.adamsgaard.dk 70 1Log /src/plan9port/log.gph mx1.adamsgaard.dk 70 1Files /src/plan9port/files.gph mx1.adamsgaard.dk 70 1Refs /src/plan9port/refs.gph mx1.adamsgaard.dk 70 1README /src/plan9port/file/README.md.gph mx1.adamsgaard.dk 70 1LICENSE /src/plan9port/file/LICENSE.gph mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1commit a6ad39aaaa36b8aadc5c35bfc803afbde32918c0 /src/plan9port/commit/a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.gph mx1.adamsgaard.dk 70 1parent bfe4377e409ce271c479665e6ef966a7b6008626 /src/plan9port/commit/bfe4377e409ce271c479665e6ef966a7b6008626.gph mx1.adamsgaard.dk 70 hAuthor: Russ Cox URL:mailto:rsc@swtch.com mx1.adamsgaard.dk 70 iDate: Tue, 26 May 2020 11:24:18 -0400 Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 ilibdraw: handle larger number of subfonts Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 iDiffstat: Err mx1.adamsgaard.dk 70 i M include/draw.h | 5 +++-- Err mx1.adamsgaard.dk 70 i M man/man3/cachechars.3 | 2 +- Err mx1.adamsgaard.dk 70 i M src/libdraw/openfont.c | 2 +- Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 i3 files changed, 5 insertions(+), 4 deletions(-) Err mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1diff --git a/include/draw.h b/include/draw.h /src/plan9port/file/include/draw.h.gph mx1.adamsgaard.dk 70 it@@ -311,8 +311,8 @@ struct Font Err mx1.adamsgaard.dk 70 i Display *display; Err mx1.adamsgaard.dk 70 i short height; /* max height of image, interline spacing */ Err mx1.adamsgaard.dk 70 i short ascent; /* top of image to baseline */ Err mx1.adamsgaard.dk 70 i- short width; /* widest so far; used in caching only */ Err mx1.adamsgaard.dk 70 i- short nsub; /* number of subfonts */ Err mx1.adamsgaard.dk 70 i+ short width; /* widest so far; used in caching only */ Err mx1.adamsgaard.dk 70 i+ int nsub; /* number of subfonts */ Err mx1.adamsgaard.dk 70 i u32int age; /* increasing counter; used for LRU */ Err mx1.adamsgaard.dk 70 i int maxdepth; /* maximum depth of all loaded subfonts */ Err mx1.adamsgaard.dk 70 i int ncache; /* size of cache */ Err mx1.adamsgaard.dk 70 it@@ -516,6 +516,7 @@ extern Display *display; Err mx1.adamsgaard.dk 70 i extern Font *font; Err mx1.adamsgaard.dk 70 i extern Image *screen; Err mx1.adamsgaard.dk 70 i extern Screen *_screen; Err mx1.adamsgaard.dk 70 i+extern int drawmousemask; /* set bits to disable receiving those buttons */ Err mx1.adamsgaard.dk 70 i extern int _cursorfd; Err mx1.adamsgaard.dk 70 i extern int _drawdebug; /* set to 1 to see errors from flushimage */ Err mx1.adamsgaard.dk 70 i extern void _setdrawop(Display*, Drawop); Err mx1.adamsgaard.dk 70 1diff --git a/man/man3/cachechars.3 b/man/man3/cachechars.3 /src/plan9port/file/man/man3/cachechars.3.gph mx1.adamsgaard.dk 70 it@@ -165,7 +165,7 @@ struct Font { Err mx1.adamsgaard.dk 70 i short height; /* max ht of image;interline space*/ Err mx1.adamsgaard.dk 70 i short ascent; /* top of image to baseline */ Err mx1.adamsgaard.dk 70 i short width; /* widest so far; used in caching */ Err mx1.adamsgaard.dk 70 i- short nsub; /* number of subfonts */ Err mx1.adamsgaard.dk 70 i+ int nsub; /* number of subfonts */ Err mx1.adamsgaard.dk 70 i ulong age; /* increasing counter; for LRU */ Err mx1.adamsgaard.dk 70 i int ncache; /* size of cache */ Err mx1.adamsgaard.dk 70 i int nsubf; /* size of subfont list */ Err mx1.adamsgaard.dk 70 1diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c /src/plan9port/file/src/libdraw/openfont.c.gph mx1.adamsgaard.dk 70 it@@ -69,7 +69,7 @@ openfont1(Display *d, char *name) Err mx1.adamsgaard.dk 70 i n = _drawflength(fd); Err mx1.adamsgaard.dk 70 i if(fd < 0 && strncmp(fname, "/mnt/font/", 10) == 0) { Err mx1.adamsgaard.dk 70 i fd = _fontpipe(fname+10); Err mx1.adamsgaard.dk 70 i- n = 128*1024; Err mx1.adamsgaard.dk 70 i+ n = 1024*1024; Err mx1.adamsgaard.dk 70 i } Err mx1.adamsgaard.dk 70 i if(fd < 0){ Err mx1.adamsgaard.dk 70 i free(nambuf); Err mx1.adamsgaard.dk 70 .