[src/trunk]: src/usr.sbin/wsfontload add -l option to dump a list of availabl...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc73b401627e
branches:  trunk
changeset: 982693:dc73b401627e
user:      macallan <macallan%NetBSD.org@localhost>
date:      Sat Apr 24 00:49:26 2021 +0000

description:
add -l option to dump a list of available fonts

diffstat:

 usr.sbin/wsfontload/wsfontload.c |  30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diffs (70 lines):

diff -r 9c7fa43fd251 -r dc73b401627e usr.sbin/wsfontload/wsfontload.c
--- a/usr.sbin/wsfontload/wsfontload.c  Sat Apr 24 00:15:37 2021 +0000
+++ b/usr.sbin/wsfontload/wsfontload.c  Sat Apr 24 00:49:26 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontload.c,v 1.21 2017/06/23 18:40:03 macallan Exp $ */
+/* $NetBSD: wsfontload.c,v 1.22 2021/04/24 00:49:26 macallan Exp $ */
 
 /*
  * Copyright (c) 1999
@@ -76,7 +76,7 @@
 {
 
        (void)fprintf(stderr,
-               "usage: %s [-Bbv] [-e encoding] [-f wsdev] [-h height]"
+               "usage: %s [-Bbvl] [-e encoding] [-f wsdev] [-h height]"
                " [-N name] [-w width] [fontfile]\n",
                      getprogname());
        exit(1);
@@ -136,8 +136,8 @@
        const char *wsdev;
        struct wsdisplay_font f;
        struct stat st;
-       int c, res, wsfd, ffd, verbose = 0;
        size_t len;
+       int c, res, wsfd, ffd, verbose = 0, listfonts = 0;
        int use_embedded_name = 1;
        void *buf;
        char nbuf[65];
@@ -153,11 +153,14 @@
        f.bitorder = DEFBITORDER;
        f.byteorder = DEFBYTEORDER;
 
-       while ((c = getopt(argc, argv, "f:w:h:e:N:bBv")) != -1) {
+       while ((c = getopt(argc, argv, "f:w:h:e:N:bBvl")) != -1) {
                switch (c) {
                case 'f':
                        wsdev = optarg;
                        break;
+               case 'l':
+                       listfonts = 1;
+                       break;
                case 'w':
                        if (sscanf(optarg, "%d", &f.fontwidth) != 1)
                                errx(1, "invalid font width");
@@ -198,6 +201,25 @@
        if (wsfd < 0)
                err(2, "open ws-device %s", wsdev);
 
+       if (listfonts == 1) {
+               struct wsdisplayio_fontinfo fi;
+               int ret;
+               unsigned int i;
+
+               fi.fi_buffersize = 4096;
+               fi.fi_numentries = 0;
+               fi.fi_fonts = malloc(4096);
+               ret = ioctl(wsfd, WSDISPLAYIO_LISTFONTS, &fi);
+               if (fi.fi_fonts == NULL || ret != 0) {
+                       err(1, "error fetching font list\n");
+               }
+               for (i = 0; i < fi.fi_numentries; i++) {
+                       printf("%s %dx%d\n", fi.fi_fonts[i].fd_name,
+                           fi.fi_fonts[i].fd_width, fi.fi_fonts[i].fd_height);
+               }
+               return 0;
+       }       
+
        if (argc > 0) {
                ffd = open(argv[0], O_RDONLY, 0);
                if (ffd < 0)