mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-14 20:37:06 +00:00
vtfontcvt: support .hex fonts with characters beyond the Unicode BMP
This is already supported by the vt(4) vfnt format mapping from code points to glyphs. Update the .hex font parser to accept up to six hex digits.
This commit is contained in:
parent
fa9de58388
commit
0f2d5632a5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=296920
|
@ -315,12 +315,13 @@ parse_hex(FILE *fp, unsigned int map_idx)
|
|||
if (bytes != NULL)
|
||||
errx(1, "malformed input: Width tag after font data");
|
||||
set_width(atoi(ln + 9));
|
||||
} else if (sscanf(ln, "%4x:", &curchar)) {
|
||||
} else if (sscanf(ln, "%6x:", &curchar)) {
|
||||
if (bytes == NULL) {
|
||||
bytes = xmalloc(wbytes * height);
|
||||
bytes_r = xmalloc(wbytes * height);
|
||||
}
|
||||
p = ln + 5;
|
||||
/* ln is guaranteed to have a colon here. */
|
||||
p = strchr(ln, ':') + 1;
|
||||
chars_per_row = strlen(p) / height;
|
||||
dwidth = width;
|
||||
if (chars_per_row / 2 > (width + 7) / 8)
|
||||
|
|
Loading…
Reference in a new issue