Catch up with box drawing characters which have been standardized in unicode

after the original wscons code was written and chose placeholder values.

From NetBSD (wsemul_vt100_chars.c r1.8 and r1.14) via Crystal Kolipe, thanks!

diff --git a/sys/dev/ic/pcdisplay_chars.c b/sys/dev/ic/pcdisplay_chars.c
index 2e0c19c..e13d1aa 100644 (file)
--- a/sys/dev/ic/pcdisplay_chars.c
+++ b/sys/dev/ic/pcdisplay_chars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcdisplay_chars.c,v 1.5 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: pcdisplay_chars.c,v 1.6 2023/04/13 18:29:35 miod Exp $ */
 /* $NetBSD: pcdisplay_chars.c,v 1.5 2000/06/08 07:01:19 cgd Exp $ */
 
 /*
@@ -272,8 +272,8 @@ static const struct {
        {0x230b, 0xd9, 3}, /* RIGHT FLOOR -> light up and left */
        {0x2329, 0x3c, 3}, /* LEFT-POINTING ANGLE BRACKET -> < */
        {0x232a, 0x3e, 3}, /* RIGHT-POINTING ANGLE BRACKET -> > */
-       {_e003U, 0x2d, 3}, /* scan 5 -> - */
-       {_e005U, 0x5f, 3}, /* scan 9 -> _ */
+       {0x2500, 0x2d, 3}, /* scan 5 -> - */
+       {0x23bd, 0x5f, 3}, /* scan 9 -> _ */
        {_e00bU, 0x7b, 3}, /* braceleftmid -> { */
        {_e00cU, 0x7d, 3}, /* bracerightmid -> } */
        {_e00fU, 0xd9, 3}, /* mirrored not sign? -> light up and left */
@@ -287,8 +287,8 @@ static const struct {
        {0x03bd, 0x76, 2}, /* GREEK SMALL LETTER NU -> v */
        {0x03c9, 0x77, 2}, /* GREEK SMALL LETTER OMEGA -> w */
        {0x20ac, 0x45, 2}, /* EURO SIGN -> E */
-       {_e002U, 0x2d, 2}, /* scan 3 -> - */
-       {_e004U, 0x2d, 2}, /* scan 7 -> - */
+       {0x23bb, 0x2d, 2}, /* scan 3 -> - */
+       {0x23bc, 0x2d, 2}, /* scan 7 -> - */
        {_e007U, 0xda, 2}, /* bracelefttp -> light down and right */
        {_e008U, 0xc0, 2}, /* braceleftbt -> light up and right */
        {_e009U, 0xbf, 2}, /* bracerighttp -> light down and left */

diff --git a/sys/dev/wscons/unicode.h b/sys/dev/wscons/unicode.h
index 2363e7a..0a61bf3 100644 (file)
--- a/sys/dev/wscons/unicode.h
+++ b/sys/dev/wscons/unicode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: unicode.h,v 1.1 2000/05/16 23:49:10 mickey Exp $ */
+/* $OpenBSD: unicode.h,v 1.2 2023/04/13 18:29:36 miod Exp $ */
 /* $NetBSD: unicode.h,v 1.1 1999/02/20 18:20:02 drochner Exp $ */
 
 /*
@@ -8,11 +8,6 @@
  */
 
 #define _e000U 0xe000 /* mirrored question mark? */
-#define _e001U 0xe001 /* scan 1 */
-#define _e002U 0xe002 /* scan 3 */
-#define _e003U 0xe003 /* scan 5 */
-#define _e004U 0xe004 /* scan 7 */
-#define _e005U 0xe005 /* scan 9 */
 #define _e006U 0xe006 /* N/L control */
 #define _e007U 0xe007 /* bracelefttp */
 #define _e008U 0xe008 /* braceleftbt */

diff --git a/sys/dev/wscons/wsemul_vt100_chars.c b/sys/dev/wscons/wsemul_vt100_chars.c
index 3af3955..919e53f 100644 (file)
--- a/sys/dev/wscons/wsemul_vt100_chars.c
+++ b/sys/dev/wscons/wsemul_vt100_chars.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: wsemul_vt100_chars.c,v 1.9 2015/03/14 03:38:50 jsg Exp $ */
-/* $NetBSD: wsemul_vt100_chars.c,v 1.4 1999/02/20 18:20:02 drochner Exp $ */
+/* $OpenBSD: wsemul_vt100_chars.c,v 1.10 2023/04/13 18:29:36 miod Exp $ */
+/* $NetBSD: wsemul_vt100_chars.c,v 1.12 2009/02/18 04:17:44 snj Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -51,8 +51,8 @@ static const u_int16_t decspcgr2uni[128] = {
        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
        0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x00a0,
 /* 6 */        0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
-       _e006U, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, _e001U,
-       _e002U, _e003U, _e004U, _e005U, 0x251c, 0x2524, 0x2534, 0x252c,
+       _e006U, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
+       0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
        0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x007f,
 };