From: Nicolas Pitre <nico@fluxnic.net>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>
Cc: Nicolas Pitre <npitre@baylibre.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 06/14] vt: use new tables in ucs.c
Date: Thu, 17 Apr 2025 14:45:08 -0400 [thread overview]
Message-ID: <20250417184849.475581-7-nico@fluxnic.net> (raw)
In-Reply-To: <20250417184849.475581-1-nico@fluxnic.net>
From: Nicolas Pitre <npitre@baylibre.com>
This removes the table from ucs.c and substitutes the generated tables
from ucs_width_table.h providing comprehensive ranges for double-width
and zero-width Unicode code points.
Also implements ucs_is_zero_width() to query the new zero-width table.
Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
---
drivers/tty/vt/ucs.c | 44 +++++++++++++++++++++-----------------
include/linux/consolemap.h | 6 +-----
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/tty/vt/ucs.c b/drivers/tty/vt/ucs.c
index dc4a6e7945..5f9f25bd20 100644
--- a/drivers/tty/vt/ucs.c
+++ b/drivers/tty/vt/ucs.c
@@ -8,22 +8,12 @@
#include <linux/consolemap.h>
#include <linux/minmax.h>
-/* ucs_is_double_width() is based on the wcwidth() implementation by
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
- * Latest version: https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
- */
-
struct ucs_interval {
u32 first;
u32 last;
};
-static const struct ucs_interval ucs_double_width_ranges[] = {
- { 0x1100, 0x115F }, { 0x2329, 0x232A }, { 0x2E80, 0x303E },
- { 0x3040, 0xA4CF }, { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF },
- { 0xFE10, 0xFE19 }, { 0xFE30, 0xFE6F }, { 0xFF00, 0xFF60 },
- { 0xFFE0, 0xFFE6 }, { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD }
-};
+#include "ucs_width_table.h"
static int interval_cmp(const void *key, const void *element)
{
@@ -37,6 +27,27 @@ static int interval_cmp(const void *key, const void *element)
return 0;
}
+static bool cp_in_range(u32 cp, const struct ucs_interval *ranges, size_t size)
+{
+ if (!in_range(cp, ranges[0].first, ranges[size - 1].last))
+ return false;
+
+ return __inline_bsearch(&cp, ranges, size, sizeof(*ranges),
+ interval_cmp) != NULL;
+}
+
+/**
+ * ucs_is_zero_width() - Determine if a Unicode code point is zero-width.
+ * @cp: Unicode code point (UCS-4)
+ *
+ * Return: true if the character is zero-width, false otherwise
+ */
+bool ucs_is_zero_width(u32 cp)
+{
+ return cp_in_range(cp, ucs_zero_width_ranges,
+ ARRAY_SIZE(ucs_zero_width_ranges));
+}
+
/**
* ucs_is_double_width() - Determine if a Unicode code point is double-width.
* @cp: Unicode code point (UCS-4)
@@ -45,13 +56,6 @@ static int interval_cmp(const void *key, const void *element)
*/
bool ucs_is_double_width(u32 cp)
{
- size_t size = ARRAY_SIZE(ucs_double_width_ranges);
-
- if (!in_range(cp, ucs_double_width_ranges[0].first,
- ucs_double_width_ranges[size - 1].last))
- return false;
-
- return __inline_bsearch(&cp, ucs_double_width_ranges, size,
- sizeof(*ucs_double_width_ranges),
- interval_cmp) != NULL;
+ return cp_in_range(cp, ucs_double_width_ranges,
+ ARRAY_SIZE(ucs_double_width_ranges));
}
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h
index 7d778752dc..b3a9118666 100644
--- a/include/linux/consolemap.h
+++ b/include/linux/consolemap.h
@@ -29,11 +29,7 @@ u32 conv_8bit_to_uni(unsigned char c);
int conv_uni_to_8bit(u32 uni);
void console_map_init(void);
bool ucs_is_double_width(uint32_t cp);
-static inline bool ucs_is_zero_width(uint32_t cp)
-{
- /* coming soon */
- return false;
-}
+bool ucs_is_zero_width(uint32_t cp);
#else
static inline u16 inverse_translate(const struct vc_data *conp, u16 glyph,
bool use_unicode)
--
2.49.0
next prev parent reply other threads:[~2025-04-17 18:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 18:45 [PATCH v3 00/14] vt: implement proper Unicode handling Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 01/14] vt: minor cleanup to vc_translate_unicode() Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 02/14] vt: move unicode processing to a separate file Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 03/14] vt: properly support zero-width Unicode code points Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 04/14] vt: introduce gen_ucs_width_table.py to create ucs_width_table.h Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 05/14] vt: create ucs_width_table.h with gen_ucs_width_table.py Nicolas Pitre
2025-04-17 18:45 ` Nicolas Pitre [this message]
2025-04-17 18:45 ` [PATCH v3 07/14] vt: introduce gen_ucs_recompose_table.py to create ucs_recompose_table.h Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 08/14] vt: create ucs_recompose_table.h with gen_ucs_recompose_table.py Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 09/14] vt: support Unicode recomposition Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 10/14] vt: pad double-width code points with a zero-width space Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 11/14] vt: remove zero-width-space handling from conv_uni_to_pc() Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 12/14] vt: update gen_ucs_width_table.py to make tables more space efficient Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 13/14] vt: refresh ucs_width_table.h and adjust code in ucs.c accordingly Nicolas Pitre
2025-04-17 18:45 ` [PATCH v3 14/14] vt: move UCS tables to the "shipped" form Nicolas Pitre
2025-04-25 14:29 ` [PATCH v3 00/14] vt: implement proper Unicode handling Greg Kroah-Hartman
2025-04-25 16:13 ` Nicolas Pitre
2025-04-26 9:24 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250417184849.475581-7-nico@fluxnic.net \
--to=nico@fluxnic.net \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=npitre@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®