CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: mlelstv Date: Sun Feb 19 05:35:35 UTC 2023 Modified Files: src/sys/dev/wsfont: wsfont.c Log Message: Add missing "latin small letter sharp s" (U+00DF) to ibm437 map. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wsfont/wsfont.c diff -u src/sys/dev/wsfont/wsfont.c:1.79 src/sys/dev/wsfont/wsfont.c:1.80 --- src/sys/dev/wsfont/wsfont.c:1.79 Mon Oct 31 13:24:58 2022 +++ src/sys/dev/wsfont/wsfont.c Sun Feb 19 05:35:35 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $ */ +/* $NetBSD: wsfont.c,v 1.80 2023/02/19 05:35:35 mlelstv Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.80 2023/02/19 05:35:35 mlelstv Exp $"); #include "opt_wsfont.h" @@ -858,7 +858,7 @@ static const u_int8_t ibm437_chars_0[] = 255,173,155,156, 0, 157, 0, 0, 0, 0, 166,174,170, 0, 0, 0, 0, 241,253, 0, 0, 0, 0, 249, 0, 0, 167,175,172,171, 0, 168, 0, 0, 0, 0, 142,143,146,128, 0, 144, 0, 0, 0, 0, 0, 0, - 0, 165, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 154, 0, 0, 0, + 0, 165, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 154, 0, 0, 225, 133,160,131, 0, 132,134,145,135,138,130,136,137,141,161,140,139, 0, 164,149,162,147, 0, 148,246, 0, 151,163,150,129, 0, 0, 152 };
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: mlelstv Date: Sun Feb 19 05:35:35 UTC 2023 Modified Files: src/sys/dev/wsfont: wsfont.c Log Message: Add missing "latin small letter sharp s" (U+00DF) to ibm437 map. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: macallan
Date: Mon Oct 31 13:24:58 UTC 2022
Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Added Files:
src/sys/dev/wsfont: term14.h
Log Message:
This is X11's 75dpi/term14.bdf, use if you want your console to look like an
xterm. Unlike QVSS this font contains accented characters, umlauts etc.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/term14.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.30 src/sys/dev/wsfont/files.wsfont:1.31
--- src/sys/dev/wsfont/files.wsfont:1.30 Sat Nov 20 00:08:23 2021
+++ src/sys/dev/wsfont/files.wsfont Mon Oct 31 13:24:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfont,v 1.30 2021/11/20 00:08:23 rin Exp $
+# $NetBSD: files.wsfont,v 1.31 2022/10/31 13:24:58 macallan Exp $
defpseudo wsfont
@@ -37,5 +37,6 @@ defflag opt_wsfont.h FONT_BOLD8x16
FONT_SPLEEN16x32
FONT_SPLEEN32x64
FONT_LIBERATION_MONO12x21
+FONT_TERMINAL8x13
file dev/wsfont/wsfontdev.c wsfont needs-flag
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.78 src/sys/dev/wsfont/wsfont.c:1.79
--- src/sys/dev/wsfont/wsfont.c:1.78 Wed Jun 8 19:47:10 2022
+++ src/sys/dev/wsfont/wsfont.c Mon Oct 31 13:24:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $ */
+/* $NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $");
#include "opt_wsfont.h"
@@ -195,6 +195,11 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
#include
#endif
+#ifdef FONT_TERMINAL8x13
+#define HAVE_FONT 1
+#include
+#endif
+
/* Make sure we always have at least one bitmap font. */
#ifndef HAVE_FONT
#define HAVE_FONT 1
@@ -317,6 +322,9 @@ static struct font builtin_fonts[] = {
#ifdef FONT_LIBERATION_MONO12x21
{ { NULL, NULL }, _Mono_12x21, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
+#ifdef FONT_TERMINAL8x13
+ { { NULL, NULL }, _8x13, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
{ { NULL, NULL }, NULL, 0, 0, 0 },
};
Added files:
Index: src/sys/dev/wsfont/term14.h
diff -u /dev/null src/sys/dev/wsfont/term14.h:1.1
--- /dev/null Mon Oct 31 13:24:58 2022
+++ src/sys/dev/wsfont/term14.h Mon Oct 31 13:24:58 2022
@@ -0,0 +1,3175 @@
+/*
+
++
+ Copyright (c) 1987, 1994 Digital Equipment Corporation
+
+ The X Consortium, and any party obtaining a copy of these files from
+ the X Consortium, directly or indirectly, is granted, free of charge, a
+ full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ nonexclusive right and license to deal in this software and
+ documentation files (the "Software"), including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons who receive
+ copies from any such party to do so. This license includes without
+ limitation a license to do the foregoing actions under any patents of
+ the party supplying this software to the X Consortium.
+
+ Digital Equipment Corporation make no representations about the
+ suitability of this software for any purpose. It is provided "as
+ is" without express or implied warranty.
+-
+*/
+
+static u_char Terminal_8x13_data[];
+
+static struct wsdisplay_font Terminal_8x13 = {
+ "Terminal", /* typeface name */
+ 32,/* firstchar */
+ 224,/* numchars */
+ 0,/* encoding */
+ 8,/* fontwidth */
+ 13,/* fontheight */
+ 1,/* stride */
+ WSDISPLAY_FONTORDER_L2R, /* bit order */
+ WSDISPLAY_FONTORDER_L2R, /* byte order */
+ Terminal_8x13_data /* data */
+};
+
+static u_char Terminal_8x13_data[] = {
+ /* 32 space */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+ /* 33 exclam */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+0x10, /* . . . []. . . . */
+0x10, /* . . . []. . . . */
+0x10, /* . . . []. . . . */
+0x10, /* . . . []. . . . */
+0x10, /* . . . []. . . . */
+0x00, /* . . . . . . . . */
+0x10, /* . . . []. . . . */
+0x10, /* . . . []. . . . */
+0x00, /* . . . . . . . . */
+0x00, /* . . . . . . . . */
+ /* 34 quotedbl */
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: macallan Date: Mon Oct 31 13:24:58 UTC 2022 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Added Files: src/sys/dev/wsfont: term14.h Log Message: This is X11's 75dpi/term14.bdf, use if you want your console to look like an xterm. Unlike QVSS this font contains accented characters, umlauts etc. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/term14.h cvs rdiff -u -r1.78 -r1.79 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: uwe Date: Wed Jun 8 19:47:11 UTC 2022 Modified Files: src/sys/dev/wsfont: wsfont.c Log Message: wsfont.c: use __arraycount instead of defining it locally To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: uwe
Date: Wed Jun 8 19:47:11 UTC 2022
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
wsfont.c: use __arraycount instead of defining it locally
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.77 src/sys/dev/wsfont/wsfont.c:1.78
--- src/sys/dev/wsfont/wsfont.c:1.77 Fri Dec 24 18:12:58 2021
+++ src/sys/dev/wsfont/wsfont.c Wed Jun 8 19:47:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.77 2021/12/24 18:12:58 jmcneill Exp $ */
+/* $NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.77 2021/12/24 18:12:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $");
#include "opt_wsfont.h"
@@ -1045,7 +1045,6 @@ static const struct wsfont_level1_glyphm
{ iso7_level1, 0, 0x26 }, /* WSDISPLAY_FONTENC_ISO7 */
};
-#define MAX_ENCODING (sizeof(encodings) / sizeof(encodings[0]))
/*
* Remap Unicode character to glyph
@@ -1057,7 +1056,7 @@ wsfont_map_unichar(struct wsdisplay_font
const struct wsfont_level2_glyphmap *map2;
int hi, lo;
- if (font->encoding < 0 || font->encoding >= MAX_ENCODING)
+ if (font->encoding < 0 || font->encoding >= __arraycount(encodings))
return (-1);
hi = (c >> 8);
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: uwe
Date: Thu May 12 23:17:42 UTC 2022
Modified Files:
src/sys/dev/wsfont: wsfontdev.c
Log Message:
wsfont(4): WSDISPLAYIO_LDFONT requires device opened for writing.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wsfont/wsfontdev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfontdev.c
diff -u src/sys/dev/wsfont/wsfontdev.c:1.19 src/sys/dev/wsfont/wsfontdev.c:1.20
--- src/sys/dev/wsfont/wsfontdev.c:1.19 Sat Apr 24 00:15:37 2021
+++ src/sys/dev/wsfont/wsfontdev.c Thu May 12 23:17:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.19 2021/04/24 00:15:37 macallan Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.20 2022/05/12 23:17:42 uwe Exp $ */
/*
* Copyright (c) 2001
@@ -27,11 +27,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.19 2021/04/24 00:15:37 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.20 2022/05/12 23:17:42 uwe Exp $");
#include
#include
#include
+#include
#include
#include
#include
@@ -122,6 +123,9 @@ wsfontioctl(dev_t dev, u_long cmd, void
switch (cmd) {
case WSDISPLAYIO_LDFONT:
#define d ((struct wsdisplay_font *)data)
+ if ((flag & FWRITE) == 0)
+ return EPERM;
+
if (d->name) {
res = copyinstr(d->name, nbuf, sizeof(nbuf), 0);
if (res)
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: uwe Date: Thu May 12 23:17:42 UTC 2022 Modified Files: src/sys/dev/wsfont: wsfontdev.c Log Message: wsfont(4): WSDISPLAYIO_LDFONT requires device opened for writing. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wsfont/wsfontdev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: rin
Date: Sat Nov 20 08:16:30 UTC 2021
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
Oops, forgot to commit builtin_fonts[] parts for Droid_Sans_Mono_10x20.
Noticed by RVP, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.75 src/sys/dev/wsfont/wsfont.c:1.76
--- src/sys/dev/wsfont/wsfont.c:1.75 Sat Nov 20 00:08:23 2021
+++ src/sys/dev/wsfont/wsfont.c Sat Nov 20 08:16:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.75 2021/11/20 00:08:23 rin Exp $ */
+/* $NetBSD: wsfont.c,v 1.76 2021/11/20 08:16:30 rin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.75 2021/11/20 00:08:23 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.76 2021/11/20 08:16:30 rin Exp $");
#include "opt_wsfont.h"
@@ -281,12 +281,15 @@ static struct font builtin_fonts[] = {
#ifdef FONT_DEJAVU_SANS_MONO12x22
{ { NULL, NULL }, _Sans_Mono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
-#ifdef FONT_DROID_SANS_MONO12x22
- { { NULL, NULL }, _Sans_Mono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
#ifdef FONT_DROID_SANS_MONO9x18
{ { NULL, NULL }, _Sans_Mono_9x18, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
+#ifdef FONT_DROID_SANS_MONO10x20
+ { { NULL, NULL }, _Sans_Mono_10x20, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
+#ifdef FONT_DROID_SANS_MONO12x22
+ { { NULL, NULL }, _Sans_Mono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
#ifdef FONT_DROID_SANS_MONO19x36
{ { NULL, NULL }, _Sans_Mono_19x36, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 20 08:16:30 UTC 2021 Modified Files: src/sys/dev/wsfont: wsfont.c Log Message: Oops, forgot to commit builtin_fonts[] parts for Droid_Sans_Mono_10x20. Noticed by RVP, thanks! To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 20 00:08:23 UTC 2021 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Added Files: src/sys/dev/wsfont: Droid_Sans_Mono_10x20.h Log Message: Add Droid_Sans_Mono_10x20, generated by ttf2wsfont(1). Having 10x20 in addition to 9x18 and 12x22 may seem redundant, but this font enables nice 80x24 and 80x30 terminals on WVGA (800x480) and SVGA (800x600) displays, respectively :) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/Droid_Sans_Mono_10x20.h cvs rdiff -u -r1.29 -r1.30 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r1.74 -r1.75 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 20 00:00:19 UTC 2021 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Log Message: Sort Droid Sans Mono family fonts by size. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wsfont/files.wsfont diff -u src/sys/dev/wsfont/files.wsfont:1.28 src/sys/dev/wsfont/files.wsfont:1.29 --- src/sys/dev/wsfont/files.wsfont:1.28 Sat Nov 21 23:00:02 2020 +++ src/sys/dev/wsfont/files.wsfont Sat Nov 20 00:00:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.wsfont,v 1.28 2020/11/21 23:00:02 rin Exp $ +# $NetBSD: files.wsfont,v 1.29 2021/11/20 00:00:19 rin Exp $ defpseudo wsfont @@ -25,8 +25,8 @@ defflag opt_wsfont.h FONT_BOLD8x16 FONT_SONY12x24 FONT_OMRON12x20 FONT_DEJAVU_SANS_MONO12x22 -FONT_DROID_SANS_MONO12x22 FONT_DROID_SANS_MONO9x18 +FONT_DROID_SANS_MONO12x22 FONT_DROID_SANS_MONO19x36 FONT_GO_MONO12x23 FONT_SPLEEN5x8 Index: src/sys/dev/wsfont/wsfont.c diff -u src/sys/dev/wsfont/wsfont.c:1.73 src/sys/dev/wsfont/wsfont.c:1.74 --- src/sys/dev/wsfont/wsfont.c:1.73 Fri Nov 19 23:55:16 2021 +++ src/sys/dev/wsfont/wsfont.c Sat Nov 20 00:00:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $ */ +/* $NetBSD: wsfont.c,v 1.74 2021/11/20 00:00:19 rin Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.74 2021/11/20 00:00:19 rin Exp $"); #include "opt_wsfont.h" @@ -130,14 +130,14 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1 #include #endif -#ifdef FONT_DROID_SANS_MONO12x22 +#ifdef FONT_DROID_SANS_MONO9x18 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_DROID_SANS_MONO9x18 +#ifdef FONT_DROID_SANS_MONO12x22 #define HAVE_FONT 1 -#include +#include #endif #ifdef FONT_DROID_SANS_MONO19x36
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 20 00:00:19 UTC 2021 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Log Message: Sort Droid Sans Mono family fonts by size. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: rin
Date: Fri Nov 19 23:55:16 UTC 2021
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
Add support to rotate anti-aliased fonts.
wsfont_rotate_{cw,ccw}_internal() have been cleaned up and unified into
new static function wsfont_rotate_internal().
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.72 src/sys/dev/wsfont/wsfont.c:1.73
--- src/sys/dev/wsfont/wsfont.c:1.72 Fri Nov 19 23:50:39 2021
+++ src/sys/dev/wsfont/wsfont.c Fri Nov 19 23:55:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.72 2021/11/19 23:50:39 rin Exp $ */
+/* $NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.72 2021/11/19 23:50:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $");
#include "opt_wsfont.h"
@@ -418,15 +418,15 @@ wsfont_enum(void (*cb)(const char *, int
#if NRASOPS_ROTATION > 0
-struct wsdisplay_font *wsfont_rotate_cw_internal(struct wsdisplay_font *);
-struct wsdisplay_font *wsfont_rotate_ccw_internal(struct wsdisplay_font *);
-
-struct wsdisplay_font *
-wsfont_rotate_cw_internal(struct wsdisplay_font *font)
+static struct wsdisplay_font *
+wsfont_rotate_internal(struct wsdisplay_font *font, int rotate)
{
- int b, n, r, namelen, newstride;
struct wsdisplay_font *newfont;
- char *newname, *newbits;
+ char *newname, *newdata;
+ u_char *ch, *newch, *p, *newp;
+ int namelen, newstride, n, h, w;
+ u_char bit;
+ bool alpha = FONT_IS_ALPHA(font), cw = (rotate == WSFONT_ROTATE_CW);
/* Duplicate the existing font... */
newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
@@ -436,103 +436,58 @@ wsfont_rotate_cw_internal(struct wsdispl
namelen = strlen(font->name) + 4;
newname = malloc(namelen, M_DEVBUF, M_WAITOK);
strlcpy(newname, font->name, namelen);
- strlcat(newname, "cw", namelen);
+ strlcat(newname, cw ? "cw" : "ccw", namelen);
newfont->name = newname;
/* Allocate a buffer big enough for the rotated font. */
- newstride = (font->fontheight + 7) / 8;
- newbits = malloc(newstride * font->fontwidth * font->numchars,
+ newstride = alpha ? font->fontheight : howmany(font->fontheight, 8);
+ newdata = malloc(newstride * font->fontwidth * font->numchars,
M_DEVBUF, M_WAITOK|M_ZERO);
- /* Rotate the font a bit at a time. */
- for (n = 0; n < font->numchars; n++) {
- unsigned char *ch = (unsigned char *)font->data +
- (n * font->stride * font->fontheight);
-
- for (r = 0; r < font->fontheight; r++) {
- for (b = 0; b < font->fontwidth; b++) {
-unsigned char *rb;
-
-rb = ch + (font->stride * r) + (b / 8);
-if (*rb & (0x80 >> (b % 8))) {
- unsigned char *rrb;
-
- rrb = newbits + newstride - 1 - (r / 8)
- + (n * newstride * font->fontwidth)
- + (newstride * b);
- *rrb |= (1 << (r % 8));
-}
- }
- }
- }
-
- newfont->data = newbits;
-
- /* Update font sizes. */
- newfont->stride = newstride;
- newfont->fontwidth = font->fontheight;
- newfont->fontheight = font->fontwidth;
-
- if (wsfont_add(newfont, 0) != 0) {
- /*
- * If we seem to have rotated this font already, drop the
- * new one...
- */
- free(newbits, M_DEVBUF);
- free(newfont, M_DEVBUF);
- newfont = NULL;
- }
-
- return (newfont);
-}
-
-struct wsdisplay_font *
-wsfont_rotate_ccw_internal(struct wsdisplay_font *font)
-{
- int b, n, r, namelen, newstride;
- struct wsdisplay_font *newfont;
- char *newname, *newbits;
-
- /* Duplicate the existing font... */
- newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
+#define BYTE_OFFSET(x, alpha) ((alpha) ? (x) : (x) / 8)
+#define BIT_FROM_LEFT(x) __BIT(7 - ((x) % 8))
+#define BIT_FROM_RIGHT(x) __BIT((x) % 8)
- *newfont = *font;
-
- namelen = strlen(font->name) + 4;
- newname = malloc(namelen, M_DEVBUF, M_WAITOK);
- strlcpy(newname, font->name, namelen);
- strlcat(newname, "ccw", namelen);
- newfont->name = newname;
-
- /* Allocate a buffer big enough for the rotated font. */
- newstride = (font->fontheight + 7) / 8;
- newbits = malloc(newstride * font->fontwidth * font->numchars,
- M_DEVBUF, M_WAITOK|M_ZERO);
-
- /* Rotate the font a bit at a time. */
+ /* Rotate the font a pixel at a time. */
for (n = 0; n < font->numchars; n++) {
- unsigned char *ch = (unsigned char *)font->data +
+ ch = (u_char *)font->data +
(n * font->stride * font->fontheight);
-
- for (r = 0; r < font->fontheight; r++) {
- for (b = 0; b < font->fontwidth; b++) {
-unsigned char *rb;
-
-rb = ch + (font->stride * r) + (b / 8);
-if (*rb & (0x80 >> (b % 8))) {
- unsigned char *rrb;
- int w = font->fontwidth;
-
- rrb =
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: rin
Date: Fri Nov 19 23:55:16 UTC 2021
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
Add support to rotate anti-aliased fonts.
wsfont_rotate_{cw,ccw}_internal() have been cleaned up and unified into
new static function wsfont_rotate_internal().
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: rin
Date: Fri Nov 19 23:50:39 UTC 2021
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
wsfont_rotate(): Add missing NULL check for wsfont_find0().
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.71 src/sys/dev/wsfont/wsfont.c:1.72
--- src/sys/dev/wsfont/wsfont.c:1.71 Mon Nov 23 12:15:39 2020
+++ src/sys/dev/wsfont/wsfont.c Fri Nov 19 23:50:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.71 2020/11/23 12:15:39 rin Exp $ */
+/* $NetBSD: wsfont.c,v 1.72 2021/11/19 23:50:39 rin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.71 2020/11/23 12:15:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.72 2021/11/19 23:50:39 rin Exp $");
#include "opt_wsfont.h"
@@ -563,6 +563,9 @@ wsfont_rotate(int cookie, int rotate)
origfont = wsfont_find0(cookie, 0x);
splx(s);
+ if (origfont == NULL)
+ return (-1);
+
switch (rotate) {
case WSFONT_ROTATE_CW:
font = wsfont_rotate_cw_internal(origfont->font);
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Fri Nov 19 23:50:39 UTC 2021 Modified Files: src/sys/dev/wsfont: wsfont.c Log Message: wsfont_rotate(): Add missing NULL check for wsfont_find0(). To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Mon Nov 4 10:44:00 UTC 2019
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen32x64.h spleen5x8.h
Log Message:
Update Spleen kernel fonts to version 1.5.0, bringing the following
improvements:
- Tweak the digit '7' for consistency with other sizes (5x8 version)
- Tweak the digit '2' for consistency with other sizes (12x24 version)
- Shift the middle bar of the digit '3' one pixel up, for better
alignement (12x24 version)
- Make the 'Z' and 'z' characters more balanced, as is the case with
other sizes (12x24 version)
- Make the slash inside the digit '0' one pixel thiner (32x64 version)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen32x64.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen5x8.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.3 src/sys/dev/wsfont/spleen12x24.h:1.4
--- src/sys/dev/wsfont/spleen12x24.h:1.3 Sat Sep 7 20:49:57 2019
+++ src/sys/dev/wsfont/spleen12x24.h Mon Nov 4 10:44:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.4 2019/11/04 10:44:00 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -502,6 +502,7 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**..**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
+ 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -509,7 +510,6 @@ static u_char spleen12x24_data[] = {
0x0c, 0x00, /* **.. */
0x18, 0x00, /* ...**... */
0x30, 0x00, /* ..** */
- 0x60, 0x00, /* .**. */
0x60, 0x60, /* .**..**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
@@ -527,13 +527,13 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**..**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x0f, 0x80, /* *... */
0x00, 0xc0, /* **.. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
+ 0x00, 0x60, /* .**. */
0x60, 0x60, /* .**..**. */
0x30, 0xc0, /* ..****.. */
0x1f, 0x80, /* ...**... */
@@ -1501,7 +1501,6 @@ static u_char spleen12x24_data[] = {
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -1511,6 +1510,7 @@ static u_char spleen12x24_data[] = {
0x30, 0x00, /* ..** */
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
+ 0x60, 0x00, /* .**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -2303,7 +2303,6 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x7f, 0xe0, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -2311,6 +2310,7 @@ static u_char spleen12x24_data[] = {
0x0c, 0x00, /* **.. */
0x18, 0x00, /* ...**... */
0x30, 0x00, /* ..** */
+ 0x60, 0x00, /* .**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
Index: src/sys/dev/wsfont/spleen32x64.h
diff -u src/sys/dev/wsfont/spleen32x64.h:1.3 src/sys/dev/wsfont/spleen32x64.h:1.4
--- src/sys/dev/wsfont/spleen32x64.h:1.3 Sat Sep 7 20:49:57 2019
+++ src/sys/dev/wsfont/spleen32x64.h Mon Nov 4 10:44:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen32x64.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
+/* $NetBSD: spleen32x64.h,v 1.4 2019/11/04 10:44:00 fcambus Exp $ */
/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -1110,16 +1110,15 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x0f, 0xf0, /* */
0x0f, 0x00, 0x1f, 0xf0, /* ...* */
0x0f, 0x00, 0x3f, 0xf0, /* ..** */
- 0x0f, 0x00, 0x7f, 0xf0, /* .*** */
- 0x0f, 0x00, 0xfe, 0xf0, /* ***. */
- 0x0f, 0x01, 0xfc, 0xf0, /* ...***.. */
- 0x0f, 0x03, 0xf8, 0xf0, /*
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: fcambus Date: Mon Nov 4 10:44:00 UTC 2019 Modified Files: src/sys/dev/wsfont: spleen12x24.h spleen32x64.h spleen5x8.h Log Message: Update Spleen kernel fonts to version 1.5.0, bringing the following improvements: - Tweak the digit '7' for consistency with other sizes (5x8 version) - Tweak the digit '2' for consistency with other sizes (12x24 version) - Shift the middle bar of the digit '3' one pixel up, for better alignement (12x24 version) - Make the 'Z' and 'z' characters more balanced, as is the case with other sizes (12x24 version) - Make the slash inside the digit '0' one pixel thiner (32x64 version) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wsfont/spleen12x24.h \ src/sys/dev/wsfont/spleen32x64.h cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen5x8.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: fcambus Date: Sat Sep 7 20:49:57 UTC 2019 Modified Files: src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h Log Message: Update Spleen kernel fonts to version 1.2.0, bringing the following improvements: - Character at position CB is 'E' with diaeresis, not with tilde (12x24 version) - Character at position D6 is 'O' with diaeresis, not with tilde (12x24 version) - Character at position DC is 'U' with diaeresis, not with tilde (12x24 version) - Fix middle bar thickness in the upper case 'eth' character (12x24 version) - Fix ring alignment for the 'A' and 'a' characters (16x32 and 32x64 versions) - Fix tilde alignment in the 'o' with tilde character (32x64 version) - Remove strain pixel on the '3' and 'k' characters (32x64 version) OK kamil@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen12x24.h \ src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Sat Sep 7 20:49:57 UTC 2019
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h
Log Message:
Update Spleen kernel fonts to version 1.2.0, bringing the following
improvements:
- Character at position CB is 'E' with diaeresis, not with tilde (12x24 version)
- Character at position D6 is 'O' with diaeresis, not with tilde (12x24 version)
- Character at position DC is 'U' with diaeresis, not with tilde (12x24 version)
- Fix middle bar thickness in the upper case 'eth' character (12x24 version)
- Fix ring alignment for the 'A' and 'a' characters (16x32 and 32x64 versions)
- Fix tilde alignment in the 'o' with tilde character (32x64 version)
- Remove strain pixel on the '3' and 'k' characters (32x64 version)
OK kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.2 src/sys/dev/wsfont/spleen12x24.h:1.3
--- src/sys/dev/wsfont/spleen12x24.h:1.2 Wed Jul 3 13:31:57 2019
+++ src/sys/dev/wsfont/spleen12x24.h Sat Sep 7 20:49:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.2 2019/07/03 13:31:57 fcambus Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -4318,9 +4318,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x1c, 0x60, /* ...***...**. */
- 0x3f, 0xc0, /* .... */
- 0x63, 0x80, /* .**...***... */
+ 0x00, 0x00, /* */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0xc0, /* ..****.. */
0x00, 0x00, /* */
0x1f, 0xe0, /* .... */
0x30, 0x00, /* ..** */
@@ -4418,9 +4418,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x1c, 0x60, /* ...***...**. */
- 0x3f, 0xc0, /* .... */
- 0x63, 0x80, /* .**...***... */
+ 0x00, 0x00, /* */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0xc0, /* ..****.. */
0x00, 0x00, /* */
0x3f, 0xc0, /* .... */
0x06, 0x00, /* .**. */
@@ -4455,7 +4455,7 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0xfc, 0x60, /* **...**. */
- 0xfc, 0x60, /* **...**. */
+ 0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
@@ -4743,9 +4743,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x1c, 0x60, /* ...***...**. */
- 0x3f, 0xc0, /* .... */
- 0x63, 0x80, /* .**...***... */
+ 0x00, 0x00, /* */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0xc0, /* ..****.. */
0x00, 0x00, /* */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
Index: src/sys/dev/wsfont/spleen16x32.h
diff -u src/sys/dev/wsfont/spleen16x32.h:1.2 src/sys/dev/wsfont/spleen16x32.h:1.3
--- src/sys/dev/wsfont/spleen16x32.h:1.2 Wed Jul 3 13:31:57 2019
+++ src/sys/dev/wsfont/spleen16x32.h Sat Sep 7 20:49:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen16x32.h,v 1.2 2019/07/03 13:31:57 fcambus Exp $ */
+/* $NetBSD: spleen16x32.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
/* $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -5488,12 +5488,12 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x00, 0x00, /* */
0x01, 0x80, /* ...**... */
0x03, 0xc0, /* .... */
0x06, 0x60, /* .**..**. */
0x06, 0x60, /* .**..**. */
0x03, 0xc0, /* .... */
+ 0x01, 0x80, /* ...**... */
0x0f, 0xf0, /* */
0x1f, 0xf8, /* ...**... */
0x38, 0x1c, /* ..***..***.. */
@@ -6547,7 +6547,6 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x00, 0x00, /* */
0x01, 0xc0, /* ...***.. */
0x03, 0xe0, /* ..*. */
0x06, 0x30, /* .**...** */
@@ -6556,6 +6555,7 @@ static u_char spleen16x32_data[] = {
0x03, 0xe0, /* ..*. */
0x01, 0xc0, /* ...***.. */
0x00, 0x00, /* */
+ 0x00, 0x00, /* */
0x1f, 0xf0, /* ...* */
0x1f, 0xf8, /*
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: fcambus Date: Wed Jul 3 13:31:58 UTC 2019 Modified Files: src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h spleen5x8.h spleen8x16.h Log Message: Update Spleen kernel fonts to the latest released version, bringing the following improvements: - Shift the middle bar of the upper case 'G' one pixel down in the 12x24 version - Shift lower case 'k' character right, for better alignment in the 12x24, 16x32, and 32x64 versions - Make upper case 'X' thicker in the 16x32 and 32x64 versions - Make upper case 'V' thicker in the 32x64 version - Make lower case 'g' character smoother in the 16x32 and 32x64 versions - Add some artefacts on each side of the lower case 'i' characters OK kamil@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wsfont/spleen12x24.h \ src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h \ src/sys/dev/wsfont/spleen5x8.h src/sys/dev/wsfont/spleen8x16.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Wed Jul 3 13:31:58 UTC 2019
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h
spleen5x8.h spleen8x16.h
Log Message:
Update Spleen kernel fonts to the latest released version, bringing
the following improvements:
- Shift the middle bar of the upper case 'G' one pixel down in the 12x24
version
- Shift lower case 'k' character right, for better alignment in the 12x24,
16x32, and 32x64 versions
- Make upper case 'X' thicker in the 16x32 and 32x64 versions
- Make upper case 'V' thicker in the 32x64 version
- Make lower case 'g' character smoother in the 16x32 and 32x64 versions
- Add some artefacts on each side of the lower case 'i' characters
OK kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h \
src/sys/dev/wsfont/spleen5x8.h src/sys/dev/wsfont/spleen8x16.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.1 src/sys/dev/wsfont/spleen12x24.h:1.2
--- src/sys/dev/wsfont/spleen12x24.h:1.1 Sun Mar 17 06:09:35 2019
+++ src/sys/dev/wsfont/spleen12x24.h Wed Jul 3 13:31:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.1 2019/03/17 06:09:35 tnn Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.2 2019/07/03 13:31:57 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -1028,13 +1028,13 @@ static u_char spleen12x24_data[] = {
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
+ 0x60, 0x00, /* .**. */
0x63, 0xe0, /* .**...*. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
- 0x60, 0x60, /* .**..**. */
0x30, 0x60, /* ..**.**. */
0x1f, 0xe0, /* .... */
0x00, 0x00, /* */
@@ -1876,6 +1876,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
+ 0x1e, 0x00, /* .... */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
@@ -1885,8 +1886,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
+ 0x07, 0x80, /* .... */
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -1922,21 +1922,21 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x61, 0x80, /* .****... */
- 0x61, 0x80, /* .****... */
- 0x63, 0x00, /* .**...** */
- 0x66, 0x00, /* .**..**. */
- 0x7c, 0x00, /* .*.. */
- 0x6c, 0x00, /* .**.**.. */
- 0x66, 0x00, /* .**..**. */
- 0x63, 0x00, /* .**...** */
- 0x61, 0x80, /* .****... */
- 0x60, 0xc0, /* .**.**.. */
- 0x60, 0xc0, /* .**.**.. */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0xc0, /* ..****.. */
+ 0x31, 0x80, /* ..**...**... */
+ 0x33, 0x00, /* ..**..** */
+ 0x3e, 0x00, /* ..*. */
+ 0x36, 0x00, /* ..**.**. */
+ 0x33, 0x00, /* ..**..** */
+ 0x31, 0x80, /* ..**...**... */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0x60, /* ..**.**. */
+ 0x30, 0x60, /* ..**.**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -5151,6 +5151,7 @@ static u_char spleen12x24_data[] = {
0x03, 0x00, /* ..** */
0x00, 0x00, /* */
0x00, 0x00, /* */
+ 0x1e, 0x00, /* .... */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
@@ -5160,8 +5161,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
+ 0x07, 0x80, /* .... */
0x00, 0x00, /*
