github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

vt: use new tables in ucs.c

Browse Source 
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>
Link: https://lore.kernel.org/r/20250417184849.475581-7-nico@fluxnic.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nicolas Pitre 2025-04-17 14:45:08 -04:00 committed by Greg Kroah-Hartman
parent 05ea6d71aa
commit 54cda9201c
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/tty/vt/ucs.c
View File

@ -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));
}

6
include/linux/consolemap.h
View File

@ -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)