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

33
firmware/font_cache.c
View file

@ -43,18 +43,13 @@ void font_cache_create(
int font_cache_entry_size =
sizeof(struct font_cache_entry) + bitmap_bytes_size;
/* make sure font cache entries are a multiple of sizeof(ucschar_t) */
while (font_cache_entry_size & (sizeof(ucschar_t) -1))
/* make sure font cache entries are a multiple of 16 bits */
if (font_cache_entry_size % 2 != 0)
font_cache_entry_size++;
int cache_size = buf_size /
(font_cache_entry_size + LRU_SLOT_OVERHEAD + sizeof(short));
#ifdef UNICODE32
/* Ensure LRU index size is a multiple of 32 bits */
cache_size &= ~1;
#endif
fcache->_size = 1;
fcache->_capacity = cache_size;
fcache->_prev_result = 0;
@ -77,12 +72,12 @@ void font_cache_create(
/*************************************************************************
* Binary search that attempts a primary lucky guess that succeeds
* when there are consecutive codes in the cache between previous
* search and new search. Returns a negative of insertion point if
* when there are consecutive codes in the cache between previous
* search and new search. Returns a negative of insertion point if
* not found.
************************************************************************/
static int search(struct font_cache* fcache,
ucschar_t char_code,
unsigned short char_code,
int size,
int *p_insertion_point )
{
@ -90,12 +85,12 @@ static int search(struct font_cache* fcache,
int left, right, mid=-1, c;
left = 0;
right = size;
/* go for a lucky guess */
mid = char_code +
mid = char_code +
fcache->_prev_result - fcache->_prev_char_code;
/* check bounds */
/* check bounds */
if ( mid < 0 || mid > right )
mid = ( left + right ) / 2;
@ -119,7 +114,7 @@ static int search(struct font_cache* fcache,
mid = (left + right) / 2;
}
while (left <= right);
/* not found */
*p_insertion_point = mid;
return 0;
@ -129,7 +124,7 @@ static int search(struct font_cache* fcache,
******************************************************************************/
struct font_cache_entry* font_cache_get(
struct font_cache* fcache,
ucschar_t char_code,
unsigned short char_code,
bool cache_only,
void (*callback) (struct font_cache_entry* p, void *callback_data),
void *callback_data)
@ -137,7 +132,7 @@ struct font_cache_entry* font_cache_get(
struct font_cache_entry* p;
int insertion_point;
int index_to_replace;
/* check bounds */
p = lru_data(&fcache->_lru, fcache->_index[0]);
if( char_code < p->_char_code )
@ -163,14 +158,14 @@ struct font_cache_entry* font_cache_get(
}
else
{
p = lru_data(&fcache->_lru,
p = lru_data(&fcache->_lru,
fcache->_index[insertion_point+1]);
if ( char_code > p->_char_code )
insertion_point++;
}
}
}
/* not found */
if (cache_only)
return NULL;