len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "internals: Support characters beyond the first unicode plane (WIP)"

Browse source 
This reverts commit d05c59f35b.
This commit is contained in:
Solomon Peachy 2025-08-20 16:09:49 -04:00
parent d05c59f35b
commit 84504c7471
44 changed files with 335 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/drivers/lcd-bitmap-common.c
View file

@ -385,7 +385,7 @@ static void LCDFN(mono_bmp_part_helper)(const unsigned char *src, int src_x,
/* put a string at a given pixel position, skipping first ofs pixel columns */
static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
{
ucschar_t *ucs;
unsigned short *ucs;
struct viewport *vp = LCDFN(current_viewport);
font_lock(vp->font, true);
struct font* pf = font_get(vp->font);
@ -429,7 +429,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
bool is_rtl, is_diac;
const unsigned char *bits;
int width, base_width, base_ofs = 0;
const ucschar_t next_ch = ucs[1];
const unsigned short next_ch = ucs[1];
if (x >= vp->width)
break;
@ -447,7 +447,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
{
if (!rtl_next_non_diac_width)
{
const ucschar_t *u;
const unsigned short *u;
/* Jump to next non-diacritic char, and calc its width */
for (u = &ucs[1]; *u && IS_DIACRITIC(*u); u++);
@ -529,7 +529,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
/* put a string at a given pixel position, skipping first ofs pixel columns */
static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
{
ucschar_t *ucs;
unsigned short *ucs;
struct viewport *vp = LCDFN(current_viewport);
struct font* pf = font_get(vp->font);
const unsigned char *bits;
@ -567,7 +567,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
/* allow utf but no diacritics or rtl lang */
for (ucs = bidi_l2v(str, 1); *ucs; ucs++)
{
const ucschar_t next_ch = ucs[1];
const unsigned short next_ch = ucs[1];
if (x >= vp->width)
break;