From 16d00819899260085ee10949012b07bf1c203db6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 15 Nov 2018 23:52:05 -0500 Subject: libdraw: redo default font construction to be hidpi-safe If $font is not set, the default font is constructed from font data linked into every libdraw binary. That process was different from the usual openfont code, and so it was not hidpi-aware, resulting in very tiny fonts out of the box on hidpi systems, until users set $font. Fix this by using openfont to construct the default font, by recognizing the name *default* when looking for font and subfont file contents. Then all the hidpi scaling applies automatically. As a side effect, the concept of a 'default subfont' is gone, as are display->defaultsubfont, getdefont, and memgetdefont. --- include/draw.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/draw.h') diff --git a/include/draw.h b/include/draw.h index 2f283bdf..926cc748 100644 --- a/include/draw.h +++ b/include/draw.h @@ -199,7 +199,6 @@ struct Display int obufsize; uchar *obufp; Font *defaultfont; - Subfont *defaultsubfont; Image *windows; Image *screenimage; int _isnewdisplay; @@ -498,7 +497,6 @@ extern Point strsubfontwidth(Subfont*, char*); extern int loadchar(Font*, Rune, Cacheinfo*, int, int, char**); extern char* subfontname(char*, char*, int); extern Subfont* _getsubfont(Display*, char*); -extern Subfont* getdefont(Display*); extern void lockdisplay(Display*); extern void unlockdisplay(Display*); extern int drawlsetrefresh(u32int, int, void*, void*); @@ -508,8 +506,6 @@ extern void swapfont(Font*, Font**, Font**); /* * Predefined */ -extern uchar defontdata[]; -extern int sizeofdefont; extern Point ZP; extern Rectangle ZR; -- cgit v1.2.3