src - OpenBSD base system

diff options


context:
space:
mode:

author	Frederic Cambus <fcambus@cvs.openbsd.org>	2020-07-10 08:28:05 +0000
committer	Frederic Cambus <fcambus@cvs.openbsd.org>	2020-07-10 08:28:05 +0000
commit	4f4879628918b82ceb6cb22fb17ce23064be8f0c (patch)
tree	27955f4d644306db7c81168469f90b01fdd0ac0b /sys/dev
parent	ac409a4b68c62499c15d91dc272ca8077f888345 (diff)

Add "Spleen 6x12" to wsfont, a font targetted at OLED displays.

Similar to "Spleen 5x8" it only contains the printable ASCII characters (96 glyphes). The font is 2-Clause BSD licensed and is my original creation. OK patrick@

Diffstat (limited to 'sys/dev')

-rw-r--r--

sys/dev/wsfont/spleen6x12.h

1294

-rw-r--r--

sys/dev/wsfont/wsfont.c

2 files changed, 1307 insertions, 5 deletions

diff --git a/sys/dev/wsfont/spleen6x12.h b/sys/dev/wsfont/spleen6x12.h
new file mode 100644
index 00000000000..9d6356b4c61
--- /dev/null
+++ b/sys/dev/wsfont/spleen6x12.h

@@ -0,0 +1,1294 @@

+/* $OpenBSD: spleen6x12.h,v 1.1 2020/07/10 08:28:04 fcambus Exp $ */

+/*

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ * notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ * notice, this list of conditions and the following disclaimer in the

+ * documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ */

+static u_char spleen6x12_data[];

+struct wsdisplay_font spleen6x12 = {

+ .name = "Spleen 6x12",

+ .index = 0,

+ .firstchar = ' ',

+ .numchars = 128 - ' ',

+ .encoding = WSDISPLAY_FONTENC_ISO,

+ .fontwidth = 6,

+ .fontheight = 12,

+ .stride = 1,

+ .bitorder = WSDISPLAY_FONTORDER_L2R,

+ .byteorder = WSDISPLAY_FONTORDER_L2R,

+ .cookie = NULL,

+ .data = spleen6x12_data

+};

+static u_char spleen6x12_data[] = {

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x50, /* .*.*.... */

+ 0x00, /* ........ */

+ 0x50, /* .*.*.... */

+ 0xf8, /* *****... */

+ 0x50, /* .*.*.... */

+ 0xf8, /* *****... */

+ 0x50, /* .*.*.... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x78, /* .****... */

+ 0xa0, /* *.*..... */

+ 0x70, /* .***.... */

+ 0x28, /* ..*.*... */

+ 0xf0, /* ****.... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x08, /* ....*... */

+ 0x48, /* .*..*... */

+ 0x50, /* .*.*.... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x28, /* ..*.*... */

+ 0x48, /* .*..*... */

+ 0x40, /* .*...... */

+ 0x00, /* ........ */

+ 0x30, /* ..**.... */

+ 0x48, /* .*..*... */

+ 0x30, /* ..**.... */

+ 0x60, /* .**..... */

+ 0x94, /* *..*.*.. */

+ 0x88, /* *...*... */

+ 0x74, /* .***.*.. */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x18, /* ...**... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x20, /* ..*..... */

+ 0x18, /* ...**... */

+ 0x00, /* ........ */

+ 0xc0, /* **...... */

+ 0x20, /* ..*..... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0xc0, /* **...... */

+ 0x00, /* ........ */

+ 0x48, /* .*..*... */

+ 0x30, /* ..**.... */

+ 0xfc, /* ******.. */

+ 0x30, /* ..**.... */

+ 0x48, /* .*..*... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0xf8, /* *****... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x80, /* *....... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x98, /* *..**... */

+ 0xa8, /* *.*.*... */

+ 0xc8, /* **..*... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x60, /* .**..... */

+ 0x20, /* ..*..... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x08, /* ....*... */

+ 0x70, /* .***.... */

+ 0x80, /* *....... */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x08, /* ....*... */

+ 0x30, /* ..**.... */

+ 0x08, /* ....*... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0x90, /* *..*.... */

+ 0xf8, /* *****... */

+ 0x10, /* ...*.... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x88, /* *...*... */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x08, /* ....*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x00, /* ........ */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x20, /* ..*..... */

+ 0x10, /* ...*.... */

+ 0x08, /* ....*... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x40, /* .*...... */

+ 0x20, /* ..*..... */

+ 0x10, /* ...*.... */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0xb8, /* *.***... */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0xf8, /* *****... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x80, /* *....... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0xb8, /* *.***... */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0xf8, /* *****... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x20, /* ..*..... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x20, /* ..*..... */

+ 0xc0, /* **...... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x90, /* *..*.... */

+ 0xe0, /* ***..... */

+ 0x90, /* *..*.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0xd8, /* **.**... */

+ 0xf8, /* *****... */

+ 0xa8, /* *.*.*... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0xc8, /* **..*... */

+ 0xa8, /* *.*.*... */

+ 0x98, /* *..**... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x80, /* *....... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x18, /* ...**... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0x70, /* .***.... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0xa8, /* *.*.*... */

+ 0xf8, /* *****... */

+ 0xd8, /* **.**... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x50, /* .*.*.... */

+ 0x20, /* ..*..... */

+ 0x50, /* .*.*.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0x80, /* *....... */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x40, /* .*...... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0x40, /* .*...... */

+ 0x20, /* ..*..... */

+ 0x10, /* ...*.... */

+ 0x08, /* ....*... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x08, /* ....*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x50, /* .*.*.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x40, /* .*...... */

+ 0x20, /* ..*..... */

+ 0x10, /* ...*.... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x08, /* ....*... */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x08, /* ....*... */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0xf8, /* *****... */

+ 0x80, /* *....... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x38, /* ..***... */

+ 0x40, /* .*...... */

+ 0xf0, /* ****.... */

+ 0x40, /* .*...... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x60, /* .**..... */

+ 0x20, /* ..*..... */

+ 0x30, /* ..**.... */

+ 0x00, /* ........ */

+ 0x10, /* ...*.... */

+ 0x00, /* ........ */

+ 0x10, /* ...*.... */

+ 0x60, /* .**..... */

+ 0x00, /* ........ */

+ 0x80, /* *....... */

+ 0x90, /* *..*.... */

+ 0xa0, /* *.*..... */

+ 0xc0, /* **...... */

+ 0xa0, /* *.*..... */

+ 0x90, /* *..*.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x40, /* .*...... */

+ 0x30, /* ..**.... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0xa8, /* *.*.*... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x00, /* ........ */

+ 0xf0, /* ****.... */

+ 0x88, /* *...*... */

+ 0xf0, /* ****.... */

+ 0x80, /* *....... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x08, /* ....*... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x88, /* *...*... */

+ 0x80, /* *....... */

+ 0x00, /* ........ */

+ 0x78, /* .****... */

+ 0x80, /* *....... */

+ 0x70, /* .***.... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0x40, /* .*...... */

+ 0xe0, /* ***..... */

+ 0x40, /* .*...... */

+ 0x30, /* ..**.... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x50, /* .*.*.... */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0xa8, /* *.*.*... */

+ 0xf8, /* *****... */

+ 0xd8, /* **.**... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x70, /* .***.... */

+ 0x88, /* *...*... */

+ 0x00, /* ........ */

+ 0x88, /* *...*... */

+ 0x78, /* .****... */

+ 0x08, /* ....*... */

+ 0xf0, /* ****.... */

+ 0x00, /* ........ */

+ 0xf8, /* *****... */

+ 0x08, /* ....*... */

+ 0x10, /* ...*.... */

+ 0x20, /* ..*..... */

+ 0x40, /* .*...... */

+ 0xf8, /* *****... */

+ 0x00, /* ........ */

+ 0x18, /* ...**... */

+ 0x20, /* ..*..... */

+ 0x60, /* .**..... */

+ 0x20, /* ..*..... */

+ 0x18, /* ...**... */

+ 0x00, /* ........ */

+ 0x20, /* ..*..... */

+ 0x00, /* ........ */

+ 0x60, /* .**..... */

+ 0x10, /* ...*.... */

+ 0x18, /* ...**... */

+ 0x10, /* ...*.... */

+ 0x60, /* .**..... */

+ 0x00, /* ........ */

+ 0x48, /* .*..*... */

+ 0xb0, /* *.**.... */

+ 0x00, /* ........ */

+};

diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 429d4c5eecb..187391e86e4 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: wsfont.c,v 1.57 2020/07/09 07:45:13 fcambus Exp $ */

+/* $OpenBSD: wsfont.c,v 1.58 2020/07/10 08:28:04 fcambus Exp $ */

/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */

/*-

@@ -48,6 +48,11 @@

#include <dev/wsfont/spleen5x8.h>

#endif

+#ifdef FONT_SPLEEN6x12

+#define HAVE_FONT 1

+#include <dev/wsfont/spleen6x12.h>

+#endif

#ifdef FONT_SPLEEN8x16

#define HAVE_FONT 1

#endif

@@ -150,17 +155,20 @@ static struct font builtin_fonts[] = {

#ifdef FONT_SPLEEN5x8

BUILTIN_FONT(spleen5x8, 4),

#endif

+#ifdef FONT_SPLEEN6x12

+ BUILTIN_FONT(spleen6x12, 5),

+#endif

#ifdef FONT_SPLEEN8x16

- BUILTIN_FONT(spleen8x16, 5),

+ BUILTIN_FONT(spleen8x16, 6),

#endif

#ifdef FONT_SPLEEN12x24

- BUILTIN_FONT(spleen12x24, 6),

+ BUILTIN_FONT(spleen12x24, 7),

#endif

#ifdef FONT_SPLEEN16x32

- BUILTIN_FONT(spleen16x32, 7),

+ BUILTIN_FONT(spleen16x32, 8),

#endif

#ifdef FONT_SPLEEN32x64

- BUILTIN_FONT(spleen32x64, 8),

+ BUILTIN_FONT(spleen32x64, 9),

#endif

#undef BUILTIN_FONT

};