len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-07-10 13:29:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] font_getstringnsize() incorrect count, add font_measurestring()

Browse source 
maxbytes counted final characters not actual bytes

font_measurestring() returns the number of bytes of a string that will
fit in a given width

Change-Id: Id73b763267e399bd558f87872b5e715076f9b7f7
This commit is contained in:
William Wilgus 2026-05-14 09:44:58 -04:00
parent 7ab521cba6
commit db32a7f07e
2 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
firmware/export/font.h
View file

@ -132,6 +132,7 @@ void font_disable_all(void);
void font_enable_all(void);
struct font* font_get(int font);
int font_measurestring(const unsigned char *str, size_t maxbytes, int *max_width, int fontnum);
int font_getstringnsize(const unsigned char *str, size_t maxbytes, int *w, int *h, int fontnumber);
int font_getstringsize(const unsigned char *str, int *w, int *h, int fontnumber);
int font_get_width(struct font* ft, ucschar_t ch);

47
firmware/font.c
View file

@ -1104,6 +1104,43 @@ const unsigned char* font_get_bits(struct font* pf, ucschar_t char_code)
#endif /* BOOTLOADER */
/*
* Returns the length (in bytes) of a given NULL terminated string
* stops after max_width, maxbytes or NULL (\0) whichever occurs first.
*/
int font_measurestring(const unsigned char *str, size_t maxbytes, int *max_width, int fontnum)
{
const unsigned char *start = str;
size_t bytes;
struct font* pf = font_get(fontnum);
font_lock( fontnum, true );
ucschar_t ch;
int width = 0;
while (true)
{
bytes = str - start;
str = utf8decode(str, &ch);
if (ch == 0 || bytes >= maxbytes)
{
break;
}
if (IS_DIACRITIC(ch))
continue;
int w = font_get_width(pf,ch);
if (width + w > *max_width)
{
break;
}
width += w;
}
*max_width = width;
font_lock( fontnum, false );
return bytes;
}
/*
* Returns the stringsize of a given NULL terminated string
* stops after maxbytes or NULL (\0) whichever occurs first.
@ -1112,17 +1149,21 @@ const unsigned char* font_get_bits(struct font* pf, ucschar_t char_code)
*/
int font_getstringnsize(const unsigned char *str, size_t maxbytes, int *w, int *h, int fontnum)
{
const unsigned char *start = str;
size_t bytes;
struct font* pf = font_get(fontnum);
font_lock( fontnum, true );
ucschar_t ch;
int width = 0;
size_t b = maxbytes - 1;
for (str = utf8decode(str, &ch); ch != 0 && b < maxbytes; str = utf8decode(str, &ch), b--)
while (true)
{
bytes = str - start;
str = utf8decode(str, &ch);
if (ch == 0 || bytes >= maxbytes)
break;
if (IS_DIACRITIC(ch))
continue;
/* get proportional width and glyph bits*/
width += font_get_width(pf,ch);
}