diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2019-01-07 21:48:38 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2019-01-07 21:48:38 +0100 |
| commit | 98222694f92aeecfcbb216fd1cb835b9550aa6d6 (patch) | |
| tree | 94f06e87ee4eb2145b46be89db141d82507c630d /src/libdraw/openfont.c | |
| parent | d95f1bcc4938b3b0b7f832b67575e07a87095721 (diff) | |
| parent | 2607cc565ee3d5facb8949e9acfed35c8ae300c9 (diff) | |
| download | plan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.tar.gz plan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.tar.bz2 plan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libdraw/openfont.c')
| -rw-r--r-- | src/libdraw/openfont.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c index 3fe9410a..366664ae 100644 --- a/src/libdraw/openfont.c +++ b/src/libdraw/openfont.c @@ -26,6 +26,8 @@ parsefontscale(char *name, char **base) return scale; } +extern char _defontfile[]; + Font* openfont1(Display *d, char *name) { @@ -37,6 +39,10 @@ openfont1(Display *d, char *name) freename = nil; scale = parsefontscale(name, &fname); + if(strcmp(fname, "*default*") == 0) { + buf = strdup(_defontfile); + goto build; + } fd = open(fname, OREAD); if(fd < 0 && strncmp(fname, "/lib/font/bit/", 14) == 0){ nambuf = smprint("#9/font/%s", fname+14); @@ -87,6 +93,7 @@ openfont1(Display *d, char *name) return 0; } buf[i] = 0; +build: fnt = buildfont(d, buf, name); free(buf); free(nambuf); |