forked from len0rd/rockbox
unicode: Support characters beyond the first unicode plane
We used 16-bit variables to store the 'character code' everywhere but this won't let us represent anything beyond U+FFFF. This patch changes those variables to a custom type that can be 32 or 16 bits depending on the build, and adjusts numerous internal APIs and datastructures to match. This includes: * utf8decode() and friends * font manipulation, caching, rendering, and generation * on-screen keyboard * FAT filesystem (parsing and generating utf16 LFNs) * WIN32 simulator platform code Note that this patch doesn't _enable_ >16bit unicode support; a followup patch will turn that on for appropriate targets. Appears to work on: * hosted linux, native, linux simulator in both 16/32-bit modes. Needs testing on: * windows and macos simulator (16bit+32bit) Change-Id: Iba111b27d2433019b6bff937cf1ebd2c4353a0e8
This commit is contained in:
parent
2a88253426
commit
a2c10f6189
44 changed files with 476 additions and 330 deletions
|
@ -22,8 +22,8 @@
|
|||
#include "kbd_helper.h"
|
||||
|
||||
/* USAGE:
|
||||
unsigned short kbd[64];
|
||||
unsigned short *kbd_p = kbd;
|
||||
ucschar_t kbd[64];
|
||||
ucschar_t *kbd_p = kbd;
|
||||
if (!kbd_create_layout("ABCD1234\n", kbd, sizeof(kbd)))
|
||||
kbd_p = NULL;
|
||||
|
||||
|
@ -34,14 +34,14 @@
|
|||
* success returns size of buffer used
|
||||
* failure returns 0
|
||||
*/
|
||||
int kbd_create_layout(const char *layout, unsigned short *buf, int bufsz)
|
||||
int kbd_create_layout(const char *layout, ucschar_t *buf, int bufsz)
|
||||
{
|
||||
unsigned short *pbuf;
|
||||
ucschar_t *pbuf;
|
||||
const unsigned char *p = layout;
|
||||
int len = 0;
|
||||
int total_len = 0;
|
||||
pbuf = buf;
|
||||
while (*p && (pbuf - buf + (ptrdiff_t) sizeof(unsigned short)) < bufsz)
|
||||
while (*p && (pbuf - buf + (ptrdiff_t) sizeof(ucschar_t)) < bufsz)
|
||||
{
|
||||
p = rb->utf8decode(p, &pbuf[len+1]);
|
||||
if (pbuf[len+1] == '\n')
|
||||
|
@ -60,7 +60,7 @@ int kbd_create_layout(const char *layout, unsigned short *buf, int bufsz)
|
|||
*pbuf = len;
|
||||
pbuf[len+1] = 0xFEFF; /* mark end of characters */
|
||||
total_len += len + 1;
|
||||
return total_len * sizeof(unsigned short);
|
||||
return total_len * sizeof(ucschar_t);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue