aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/draw.h5
-rw-r--r--man/man3/cachechars.32
-rw-r--r--src/libdraw/openfont.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/include/draw.h b/include/draw.h
index 926cc748..9a22e6b6 100644
--- a/include/draw.h
+++ b/include/draw.h
@@ -311,8 +311,8 @@ struct Font
Display *display;
short height; /* max height of image, interline spacing */
short ascent; /* top of image to baseline */
- short width; /* widest so far; used in caching only */
- short nsub; /* number of subfonts */
+ short width; /* widest so far; used in caching only */
+ int nsub; /* number of subfonts */
u32int age; /* increasing counter; used for LRU */
int maxdepth; /* maximum depth of all loaded subfonts */
int ncache; /* size of cache */
@@ -516,6 +516,7 @@ extern Display *display;
extern Font *font;
extern Image *screen;
extern Screen *_screen;
+extern int drawmousemask; /* set bits to disable receiving those buttons */
extern int _cursorfd;
extern int _drawdebug; /* set to 1 to see errors from flushimage */
extern void _setdrawop(Display*, Drawop);
diff --git a/man/man3/cachechars.3 b/man/man3/cachechars.3
index b0c7abfa..f2d82f19 100644
--- a/man/man3/cachechars.3
+++ b/man/man3/cachechars.3
@@ -165,7 +165,7 @@ struct Font {
short height; /* max ht of image;interline space*/
short ascent; /* top of image to baseline */
short width; /* widest so far; used in caching */
- short nsub; /* number of subfonts */
+ int nsub; /* number of subfonts */
ulong age; /* increasing counter; for LRU */
int ncache; /* size of cache */
int nsubf; /* size of subfont list */
diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c
index 9312eb43..8714a8c7 100644
--- a/src/libdraw/openfont.c
+++ b/src/libdraw/openfont.c
@@ -69,7 +69,7 @@ openfont1(Display *d, char *name)
n = _drawflength(fd);
if(fd < 0 && strncmp(fname, "/mnt/font/", 10) == 0) {
fd = _fontpipe(fname+10);
- n = 128*1024;
+ n = 1024*1024;
}
if(fd < 0){
free(nambuf);