16d0081989
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.
39 lines
701 B
C
39 lines
701 B
C
#include <u.h>
|
|
#include <libc.h>
|
|
#include <draw.h>
|
|
|
|
/*
|
|
* Easy versions of the cache routines; may be substituted by fancier ones for other purposes
|
|
*/
|
|
|
|
static char *lastname;
|
|
Subfont *lastsubfont;
|
|
|
|
Subfont*
|
|
lookupsubfont(Display *d, char *name)
|
|
{
|
|
if(lastname && strcmp(name, lastname)==0)
|
|
if(d==lastsubfont->bits->display){
|
|
lastsubfont->ref++;
|
|
return lastsubfont;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
installsubfont(char *name, Subfont *subfont)
|
|
{
|
|
free(lastname);
|
|
lastname = strdup(name);
|
|
lastsubfont = subfont; /* notice we don't free the old one; that's your business */
|
|
}
|
|
|
|
void
|
|
uninstallsubfont(Subfont *subfont)
|
|
{
|
|
if(subfont == lastsubfont){
|
|
free(lastname);
|
|
lastname = 0;
|
|
lastsubfont = 0;
|
|
}
|
|
}
|