len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-06 21:25:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#13424: When spelling out a string, decode it into utf8 codepoints first

Browse source 
We still can't spell out non-ascii letters but this is a first step towards
doing it correctly.

Change-Id: Ic981af7d4e351084ff53264589df3f7662763af4
This commit is contained in:
Solomon Peachy 2025-11-23 08:46:43 -05:00
parent c208b84585
commit ebaa78542d
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/talk.c
View file

@ -756,7 +756,7 @@ static void do_enqueue(bool enqueue)
/* spell a string */ /* spell a string */
static int _talk_spell(const char* spell, size_t len, bool enqueue) static int _talk_spell(const char* spell, size_t len, bool enqueue)
{ {
char c; /* currently processed char */ ucschar_t c; /* currently processed char */
int button = BUTTON_NONE; int button = BUTTON_NONE;
if (talk_is_disabled()) if (talk_is_disabled())
@ -766,8 +766,25 @@ static int _talk_spell(const char* spell, size_t len, bool enqueue)
size_t len0 = len - 1; size_t len0 = len - 1;
while ((c = *spell++) != '\0' && len0-- < len) /* Tokenize into UTF8 codepoints */
while ((spell = utf8decode(spell, &c)), c != '\0')
{ {
int count;
if (c <= 0x7f)
count = 1;
else if (c <= 0x7ff)
count = 2;
else if (c <= 0xffff)
count = 3;
else
count = 4;
len0 -= count;
if (len0 >= len) /* ie we underflow and wrap */
break;
/* NOTE: This is COMPLETLY BROKEN for NON-ENGLISH */
/* if this grows into too many cases, I should use a table */ /* if this grows into too many cases, I should use a table */
if (c >= 'A' && c <= 'Z') if (c >= 'A' && c <= 'Z')
talk_id(VOICE_CHAR_A + c - 'A', true); talk_id(VOICE_CHAR_A + c - 'A', true);
@ -786,7 +803,6 @@ static int _talk_spell(const char* spell, size_t len, bool enqueue)
else if (c == PATH_SEPCH) else if (c == PATH_SEPCH)
talk_id(VOICE_CHAR_SLASH, true); talk_id(VOICE_CHAR_SLASH, true);
if (QUEUE_LEVEL == QUEUE_SIZE - 1) if (QUEUE_LEVEL == QUEUE_SIZE - 1)
button = button_get(false); /* prevent UI unresponsiveness */ button = button_get(false); /* prevent UI unresponsiveness */