Page MenuHomeFreeBSD
Differential D20650 Diff 58666 usr.bin/vtfontcvt/vtfontcvt.c

Changeset View

Standalone View

View Options

usr.bin/vtfontcvt/vtfontcvt.c

Show First 20 Lines • Show All 217 Lines • ▼ Show 20 Lines if (bytes_r != NULL) {
gl = add_glyph(bytes_r, map_idx + 1, 0); gl = add_glyph(bytes_r, map_idx + 1, 0);
if (add_mapping(gl, curchar, map_idx + 1) != 0) if (add_mapping(gl, curchar, map_idx + 1) != 0)
return (1); return (1);
} }
} }
return (0); return (0);
} }
/*
* Right-shift glyph row by _shift_ bits. Row _len_ bits wide, _size_ bytes.
*/
static int static int
parse_bitmap_line(uint8_t *left, uint8_t *right, unsigned int line, rshift_row(uint8_t *line, size_t size, size_t len, size_t shift)
unsigned int dwidth)
{ {
uint8_t *p; size_t d, s, i;
unsigned int i, subline; uint16_t t;
if (dwidth != width && dwidth != width * 2) assert(size > 0 && len > 0);
errx(1, "Bitmap with unsupported width %u!", dwidth); assert(size * 8 >= len);
/* Move pixel data right to simplify splitting double characters. */ if (shift == 0)
line >>= (howmany(dwidth, 8) * 8) - dwidth; return (0);
for (i = dwidth / width; i > 0; i--) { d = shift / 8;
p = (i == 2) ? right : left; s = 8 - shift % 8;
i = howmany(len, 8);
subline = line & ((1 << width) - 1); while (i > 0) {
0mpUnsubmitted
Not Done
Inline Actions

Would it be cleaner if it was a for loop instead?

0mp: Would it be cleaner if it was a for loop instead?
emasteAuthorUnsubmitted
Done
Inline Actions

Slightly awkward because the i-- is at the beginning of the body not the end. I find the implementation of the rshift_row function a little unusual but will commit the submitted / tested version, perhaps rework it later.

emaste: Slightly awkward because the `i--` is at the beginning of the body not the end. I find the…
subline <<= (howmany(width, 8) * 8) - width; i--;
if (wbytes == 1) { t = *(line + i);
*p = subline; *(line + i) = 0;
} else if (wbytes == 2) {
*p++ = subline >> 8;
*p = subline;
} else {
errx(1, "Unsupported wbytes %u!", wbytes);
}
line >>= width; t <<= s;
if (i + d + 1 < size)
*(line + i + d + 1) |= (uint8_t)t;
if (i + d < size)
*(line + i + d) = t >> 8;
} }
return (0);
}
/*
* Split double-width characters into left and right half. Single-width
* characters in _left_ only.
*/
static int
split_row(uint8_t *left, uint8_t *right, uint8_t *line, size_t w)
{
size_t s, i;
s = wbytes * 8 - width;
memcpy(left, line, wbytes);
*(left + wbytes - 1) &= 0xFF << s;
if (w > width) { /* Double-width character. */
uint8_t t;
for (i = 0; i < wbytes; i++) {
t = *(line + wbytes + i - 1);
t <<= 8 - s;
t |= *(line + wbytes + i) >> s;
*(right + i) = t;
}
*(right + wbytes - 1) &= 0xFF << s;
}
return (0); return (0);
} }
static void
set_height(int h)
{
if (h <= 0 || h > VFNT_MAXDIMENSION)
errx(1, "invalid height %d", h);
height = h;
}
static void
set_width(int w)
{
if (w <= 0 || w > VFNT_MAXDIMENSION)
errx(1, "invalid width %d", w);
width = w;
wbytes = howmany(width, 8);
}
static int static int
parse_bdf(FILE *fp, unsigned int map_idx) parse_bdf(FILE *fp, unsigned int map_idx)
{ {
char *ln; char *line, *ln, *p;
size_t length; size_t length;
uint8_t bytes[wbytes * height], bytes_r[wbytes * height]; uint8_t *bytes, *bytes_r;
unsigned int curchar = 0, dwidth = 0, i, line; unsigned int curchar = 0, i, j, linenum = 0, bbwbytes;
int dwidth = 0;
int bbh, bbox, bboy, bbw, dwy = 0;
int fbbw = 0, fbbh, fbbox, fbboy; /* Font bounding box. */
int rv;
char spc = '\0';
/*
* Step 1: Parse FONT logical font descriptor and FONTBOUNDINGBOX
* bounding box.
*/
while ((ln = fgetln(fp, &length)) != NULL) { while ((ln = fgetln(fp, &length)) != NULL) {
linenum++;
ln[length - 1] = '\0'; ln[length - 1] = '\0';
if (strncmp(ln, "ENCODING ", 9) == 0) { if (strncmp(ln, "FONT ", 5) == 0) {
curchar = atoi(ln + 9); p = ln + 5;
i = 0;
while ((p = strchr(p, '-')) != NULL) {
p++;
i++;
if (i == 11) {
spc = *p;
break;
} }
}
} else if (strncmp(ln, "FONTBOUNDINGBOX ", 16) == 0 &&
sscanf(ln + 16, "%d %d %d %d", &fbbw, &fbbh, &fbbox,
&fbboy) == 4) {
set_width(fbbw);
set_height(fbbh);
break;
}
}
if (fbbw == 0)
errx(1, "broken font header");
if (spc != 'c' && spc != 'C')
errx(1, "font spacing \"C\" (character cell) required");
if (strncmp(ln, "DWIDTH ", 7) == 0) { /* Step 2: Validate DWIDTH (Device Width) of all glyphs. */
dwidth = atoi(ln + 7); while ((ln = fgetln(fp, &length)) != NULL) {
linenum++;
ln[length - 1] = '\0';
if (strncmp(ln, "DWIDTH ", 7) == 0 &&
sscanf(ln + 7, "%d %d", &dwidth, &dwy) == 2) {
if (dwy != 0 || (dwidth != fbbw && dwidth * 2 != fbbw))
errx(1, "bitmap with unsupported DWIDTH %d %d at line %u",
dwidth, dwy, linenum);
if (dwidth < fbbw)
set_width(dwidth);
} }
}
if (strncmp(ln, "BITMAP", 6) == 0 && /* Step 3: Read glyph data. */
dwidth = bbw = bbh = 0;
rewind(fp);
linenum = 0;
bytes = xmalloc(wbytes * height);
bytes_r = xmalloc(wbytes * height);
line = xmalloc(wbytes * 2);
while ((ln = fgetln(fp, &length)) != NULL) {
linenum++;
ln[length - 1] = '\0';
if (strncmp(ln, "ENCODING ", 9) == 0) {
curchar = atoi(ln + 9);
} else if (strncmp(ln, "DWIDTH ", 7) == 0) {
dwidth = atoi(ln + 7);
} else if (strncmp(ln, "BBX ", 4) == 0 &&
sscanf(ln + 4, "%d %d %d %d", &bbw, &bbh, &bbox,
&bboy) == 4) {
if (bbw < 1 || bbh < 1 || bbw > fbbw || bbh > fbbh ||
bbox < fbbox || bboy < fbboy)
errx(1, "broken bitmap with BBX %d %d %d %d at line %u",
bbw, bbh, bbox, bboy, linenum);
bbwbytes = howmany(bbw, 8);
} else if (strncmp(ln, "BITMAP", 6) == 0 &&
(ln[6] == ' ' || ln[6] == '\0')) { (ln[6] == ' ' || ln[6] == '\0')) {
if (dwidth == 0 || bbw == 0 || bbh == 0)
errx(1, "broken char header at line %u!",
linenum);
memset(bytes, 0, wbytes * height);
memset(bytes_r, 0, wbytes * height);
/* /*
* Assume that the next _height_ lines are bitmap * Assume that the next _bbh_ lines are bitmap data.
* data. ENDCHAR is allowed to terminate the bitmap * ENDCHAR is allowed to terminate the bitmap
* early but is not otherwise checked; any extra data * early but is not otherwise checked; any extra data
* is ignored. * is ignored.
*/ */
for (i = 0; i < height; i++) { for (i = (fbbh + fbboy) - (bbh + bboy);
i < (unsigned int)((fbbh + fbboy) - bboy); i++) {
if ((ln = fgetln(fp, &length)) == NULL) if ((ln = fgetln(fp, &length)) == NULL)
errx(1, "Unexpected EOF!"); errx(1, "unexpected EOF");
linenum++;
ln[length - 1] = '\0'; ln[length - 1] = '\0';
if (strcmp(ln, "ENDCHAR") == 0) { if (strcmp(ln, "ENDCHAR") == 0)
memset(bytes + i * wbytes, 0,
(height - i) * wbytes);
memset(bytes_r + i * wbytes, 0,
(height - i) * wbytes);
break; break;
if (strlen(ln) < bbwbytes * 2)
errx(1, "broken bitmap at line %u",
linenum);
memset(line, 0, wbytes * 2);
for (j = 0; j < bbwbytes; j++) {
unsigned int val;
if (sscanf(ln + j * 2, "%2x", &val) ==
0)
break;
*(line + j) = (uint8_t)val;
} }
sscanf(ln, "%x", &line);
if (parse_bitmap_line(bytes + i * wbytes,
bytes_r + i * wbytes, line, dwidth) != 0)
return (1);
}
if (add_char(curchar, map_idx, bytes, rv = rshift_row(line, wbytes * 2, bbw,
dwidth == width * 2 ? bytes_r : NULL) != 0) bbox - fbbox);
return (1); if (rv != 0)
} goto out;
}
return (0); rv = split_row(bytes + i * wbytes,
bytes_r + i * wbytes, line, dwidth);
if (rv != 0)
goto out;
} }
static void rv = add_char(curchar, map_idx, bytes,
set_height(int h) dwidth > (int)width ? bytes_r : NULL);
{ if (rv != 0)
if (h <= 0 || h > VFNT_MAXDIMENSION) goto out;
errx(1, "invalid height %d", h);
height = h; dwidth = bbw = bbh = 0;
} }
}
static void out:
set_width(int w) free(bytes);
{ free(bytes_r);
if (w <= 0 || w > VFNT_MAXDIMENSION) free(line);
errx(1, "invalid width %d", w); return (rv);
width = w;
wbytes = howmany(width, 8);
} }
static int static int
parse_hex(FILE *fp, unsigned int map_idx) parse_hex(FILE *fp, unsigned int map_idx)
{ {
char *ln, *p; char *ln, *p;
char fmt_str[8];
size_t length; size_t length;
uint8_t *bytes = NULL, *bytes_r = NULL; uint8_t *bytes = NULL, *bytes_r = NULL, *line = NULL;
unsigned curchar = 0, i, line, chars_per_row, dwidth; unsigned curchar = 0, gwidth, gwbytes, i, j, chars_per_row;
int rv = 0; int rv = 0;
while ((ln = fgetln(fp, &length)) != NULL) { while ((ln = fgetln(fp, &length)) != NULL) {
ln[length - 1] = '\0'; ln[length - 1] = '\0';
if (strncmp(ln, "# Height: ", 10) == 0) { if (strncmp(ln, "# Height: ", 10) == 0) {
if (bytes != NULL) if (bytes != NULL)
errx(1, "malformed input: Height tag after font data"); errx(1, "malformed input: Height tag after font data");
set_height(atoi(ln + 10)); set_height(atoi(ln + 10));
} else if (strncmp(ln, "# Width: ", 9) == 0) { } else if (strncmp(ln, "# Width: ", 9) == 0) {
if (bytes != NULL) if (bytes != NULL)
errx(1, "malformed input: Width tag after font data"); errx(1, "malformed input: Width tag after font data");
set_width(atoi(ln + 9)); set_width(atoi(ln + 9));
} else if (sscanf(ln, "%6x:", &curchar)) { } else if (sscanf(ln, "%6x:", &curchar)) {
if (bytes == NULL) { if (bytes == NULL) {
bytes = xmalloc(wbytes * height); bytes = xmalloc(wbytes * height);
bytes_r = xmalloc(wbytes * height); bytes_r = xmalloc(wbytes * height);
line = xmalloc(wbytes * 2);
} }
/* ln is guaranteed to have a colon here. */ /* ln is guaranteed to have a colon here. */
p = strchr(ln, ':') + 1; p = strchr(ln, ':') + 1;
chars_per_row = strlen(p) / height; chars_per_row = strlen(p) / height;
dwidth = width; if (chars_per_row < wbytes * 2)
if (chars_per_row / 2 > (width + 7) / 8) errx(1,
dwidth *= 2; /* Double-width character. */ "malformed input: broken bitmap, character %06x",
snprintf(fmt_str, sizeof(fmt_str), "%%%ux", curchar);
chars_per_row); gwidth = width * 2;
gwbytes = howmany(width, 8);
if (chars_per_row < gwbytes * 2 || gwidth <= 8) {
gwidth = width; /* Single-width character. */
gwbytes = wbytes;
}
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
sscanf(p, fmt_str, &line); for (j = 0; j < gwbytes; j++) {
p += chars_per_row; unsigned int val;
if (parse_bitmap_line(bytes + i * wbytes, if (sscanf(p + j * 2, "%2x", &val) == 0)
bytes_r + i * wbytes, line, dwidth) != 0) { break;
rv = 1; *(line + j) = (uint8_t)val;
}
rv = split_row(bytes + i * wbytes,
bytes_r + i * wbytes, line, gwidth);
if (rv != 0)
goto out; goto out;
p += gwbytes * 2;
} }
}
if (add_char(curchar, map_idx, bytes, rv = add_char(curchar, map_idx, bytes,
dwidth == width * 2 ? bytes_r : NULL) != 0) { gwidth != width ? bytes_r : NULL);
rv = 1; if (rv != 0)
goto out; goto out;
} }
} }
}
out: out:
free(bytes); free(bytes);
free(bytes_r); free(bytes_r);
free(line);
return (rv); return (rv);
} }
static int static int
parse_file(const char *filename, unsigned int map_idx) parse_file(const char *filename, unsigned int map_idx)
{ {
FILE *fp; FILE *fp;
size_t len; size_t len;
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines