Add Spleen 8x16, 12x24, 16x32, and 32x64 variants to wsfont.

Together with the already imported Spleen 5x8, it will allow using the
same font family across a wide range of screen resolutions, from small
OLED displays to 4K monitors.

The fonts are 2-Clause BSD licensed and are my original creation.

OK jcs@, brynet@, bcallah@, kettenis@

1 files changed, 33 insertions, 1 deletions

diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 88b0764c319..67f12c9d264 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsfont.c,v 1.53 2018/09/24 11:10:34 fcambus Exp $ */
+/*	$OpenBSD: wsfont.c,v 1.54 2018/12/02 14:44:33 fcambus Exp $ */
 /*	$NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $	*/
 
 /*-
@@ -48,6 +48,26 @@
 #include <dev/wsfont/spleen5x8.h>
 #endif
 
+#ifdef FONT_SPLEEN8x16
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen8x16.h>
+#endif
+
+#ifdef FONT_SPLEEN12x24
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen12x24.h>
+#endif
+
+#ifdef FONT_SPLEEN16x32
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen16x32.h>
+#endif
+
+#ifdef FONT_SPLEEN32x64
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen32x64.h>
+#endif
+
 #ifdef FONT_BOLD8x16
 #define HAVE_FONT 1
 #include <dev/wsfont/bold8x16.h>
@@ -114,6 +134,18 @@ static struct font builtin_fonts[] = {
 #ifdef FONT_SPLEEN5x8
 	BUILTIN_FONT(spleen5x8, 4),
 #endif
+#ifdef FONT_SPLEEN8x16
+	BUILTIN_FONT(spleen8x16, 5),
+#endif
+#ifdef FONT_SPLEEN12x24
+	BUILTIN_FONT(spleen12x24, 6),
+#endif
+#ifdef FONT_SPLEEN16x32
+	BUILTIN_FONT(spleen16x32, 7),
+#endif
+#ifdef FONT_SPLEEN32x64
+	BUILTIN_FONT(spleen32x64, 8),
+#endif
 #undef BUILTIN_FONT
 };