Blame

Date:
Message:
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.
Actions:
History | Blob | Raw File
 1 9b4a2324 2009-07-09 rsc typedef struct XFont XFont;

 2 9b4a2324 2009-07-09 rsc XFont *xfont;

 3 9b4a2324 2009-07-09 rsc int nxfont;

 4 9b4a2324 2009-07-09 rsc 

 5 775cb933 2015-08-27 rsc enum {

 6 775cb933 2015-08-27 rsc 	SubfontSize = 32,

 7 775cb933 2015-08-27 rsc 	SubfontMask = (1<<16)/SubfontSize - 1,

 8 775cb933 2015-08-27 rsc };

 9 775cb933 2015-08-27 rsc 

10 9b4a2324 2009-07-09 rsc struct XFont

11 9b4a2324 2009-07-09 rsc {

12 9b4a2324 2009-07-09 rsc 	char *name;

13 9b4a2324 2009-07-09 rsc 	int loaded;

14 775cb933 2015-08-27 rsc 	uchar range[(1<<16)/SubfontSize];	// range[i] == whether to have subfont i*SubfontSize to (i+1)*SubfontSize - 1.

15 9b4a2324 2009-07-09 rsc 	int nrange;

16 9b4a2324 2009-07-09 rsc 	int unit;

17 9b4a2324 2009-07-09 rsc 	double height;

18 9b4a2324 2009-07-09 rsc 	double originy;

19 32dc15fa 2015-02-17 rsc 	void (*loadheight)(XFont*, int, int*, int*);

20 9c611279 2012-10-21 rsc 

21 9c611279 2012-10-21 rsc 	// fontconfig workarround, as FC_FULLNAME does not work for matching fonts.

22 9c611279 2012-10-21 rsc 	char *fontfile;

23 9c611279 2012-10-21 rsc 	int  index;

24 9b4a2324 2009-07-09 rsc };

25 9b4a2324 2009-07-09 rsc 

26 9b4a2324 2009-07-09 rsc void	loadfonts(void);

27 9b4a2324 2009-07-09 rsc void	load(XFont*);

28 32dc15fa 2015-02-17 rsc Memsubfont*	mksubfont(XFont*, char*, int, int, int, int);

29 9b4a2324 2009-07-09 rsc 

30 9b4a2324 2009-07-09 rsc extern XFont *xfont;

31 9b4a2324 2009-07-09 rsc extern int nxfont;

32 9b4a2324 2009-07-09 rsc void *emalloc9p(ulong);

33 1785490b 2012-12-01 rsc 

34 1785490b 2012-12-01 rsc void	drawpjw(Memimage*, Fontchar*, int, int, int, int);