d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt fontcvt: Make height and width optional arguments

Browse Source 
Now defaults to a 16x8 font size.  The height and width can be specified
using -h and -w respectively.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2014-06-03 17:53:11 +00:00
parent a673123f8c
commit d7feb799e6
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/tools/vt/fontcvt/fontcvt.c
View File

@ -39,12 +39,13 @@ __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#define VFNT_MAPS 4 #define VFNT_MAPS 4
#define VFNT_MAP_NORMAL 0 #define VFNT_MAP_NORMAL 0
#define VFNT_MAP_BOLD 2 #define VFNT_MAP_BOLD 2
static unsigned int width, wbytes, height; static unsigned int width = 8, wbytes, height = 16;
struct glyph { struct glyph {
TAILQ_ENTRY(glyph) g_list; TAILQ_ENTRY(glyph) g_list;
@ -83,7 +84,7 @@ usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: fontcvt width height normal.bdf bold.bdf out.fnt\n"); "usage: fontcvt [-w width] [-h height] normal.bdf bold.bdf out.fnt\n");
exit(1); exit(1);
} }
@ -384,27 +385,42 @@ write_fnt(const char *filename)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int ch;
assert(sizeof(struct file_header) == 32); assert(sizeof(struct file_header) == 32);
assert(sizeof(struct file_mapping) == 8); assert(sizeof(struct file_mapping) == 8);
if (argc != 6) while ((ch = getopt(argc, argv, "h:w:")) != -1) {
usage(); switch (ch) {
case 'h':
width = atoi(argv[1]); height = atoi(optarg);
wbytes = howmany(width, 8); break;
height = atoi(argv[2]); case 'w':
height = atoi(optarg);
break;
case '?':
default:
usage();
}
}
argc -= optind;
argv += optind;
if (parse_bdf(argv[3], VFNT_MAP_NORMAL) != 0) if (argc != 3)
usage();
wbytes = howmany(width, 8);
if (parse_bdf(argv[0], VFNT_MAP_NORMAL) != 0)
return (1); return (1);
if (parse_bdf(argv[4], VFNT_MAP_BOLD) != 0) if (parse_bdf(argv[1], VFNT_MAP_BOLD) != 0)
return (1); return (1);
number_glyphs(); number_glyphs();
fold_mappings(0); fold_mappings(0);
fold_mappings(1); fold_mappings(1);
fold_mappings(2); fold_mappings(2);
fold_mappings(3); fold_mappings(3);
if (write_fnt(argv[5]) != 0) if (write_fnt(argv[2]) != 0)
return (1); return (1);
printf( printf(