Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-24 17:44:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

part implementation of GetGlyphsByRules

Browse Source
This commit is contained in:
Vincent Wei
2019-01-22 10:50:15 +08:00
parent 5ef2e0fa42
commit 1cfd2fe324
3 changed files with 155 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gdi.h
+7 -7
View File
@@ -7422,10 +7422,10 @@ MG_EXPORT int GUIAPI WCS2MBSEx (PLOGFONT log_font, unsigned char* dest,
n, NULL)
/** The function determines the general category (basic type) of a UNICODE character. */
MG_EXPORT int GUIAPI UCharGetType(Uchar32 uc);
MG_EXPORT UCharBasicType GUIAPI UCharGetType(Uchar32 uc);
/** The function determines the break property of a UNICODE character. */
MG_EXPORT int GUIAPI UCharGetBreak(Uchar32 uc);
MG_EXPORT UCharBreakType GUIAPI UCharGetBreak(Uchar32 uc);
/** The function determines the BIDI type of a UNICODE character. */
MG_EXPORT unsigned int GUIAPI UCharGetBIDIType(Uchar32 uc);
@@ -10254,16 +10254,16 @@ static inline int GUIAPI LanguageCodeFromISO639s1Code (const char* iso639_1)
/**
* \def WSR_NOWRAP
*
* \brief Like \a WS_NORMAL, this value collapses white spaces; but like WS_PRE,
* it does not allow wrapping.
* \brief Like \a WSR_NORMAL, this value collapses white spaces; but like
* \a WSR_PRE, it does not allow wrapping.
*/
#define WSR_NOWRAP 0x03
/**
* \def WSR_PRE_WRAP
*
* \brief Like \a WS_PRE, this value preserves white space; but like WS_NORMAL,
* it allows wrapping.
* \brief Like \a WSR_PRE, this value preserves white space; but like
* \a WSR_NORMAL, it allows wrapping.
*/
#define WSR_PRE_WRAP 0x04
@@ -10271,7 +10271,7 @@ static inline int GUIAPI LanguageCodeFromISO639s1Code (const char* iso639_1)
* \def WSR_BREAK_SPACES
*
* \brief
* The behavior is identical to that of WS_PRE_WRAP, except that:
* The behavior is identical to that of \a WSR_PRE_WRAP, except that:
* - Any sequence of preserved white space always takes up space,
* including at the end of the line.
* - A line breaking opportunity exists after every preserved
src/font/charset.c
+4 -5
View File
@@ -597,7 +597,6 @@ static Uchar32 iso8859_4_conv_to_uc32 (Glyph32 glyph_value)
return glyph_value;
else
return (Uchar32) iso8859_4_unicode_map [glyph_value - 0xA1];
}
static int iso8859_4_conv_from_uc32 (Uchar32 wc, unsigned char* mchar)
@@ -4413,15 +4412,15 @@ BOOL IsCompatibleCharset (const char* charset, CHARSETOPS* ops)
#ifdef _MGCHARSET_UNICODE
int GUIAPI UCharGetType(Uchar32 uc)
UCharBasicType GUIAPI UCharGetType(Uchar32 uc)
{
return TYPE(uc);
return (UCharBasicType)TYPE(uc);
}
/** The function determines the break type of a UNICODE character. */
int GUIAPI UCharGetBreak(Uchar32 uc)
UCharBreakType GUIAPI UCharGetBreak(Uchar32 uc)
{
return PROP(uc);
return (UCharBreakType)PROP(uc);
}
/** The function determines the BIDI type of a UNICODE character. */
src/newgdi/glyph-css.c
+144 -42
View File
@@ -69,6 +69,108 @@
#define MIN_LEN_GLYPHS 4
#define INC_LEN_GLYPHS 4
static int get_next_glyph(DEVFONT* mbc_devfont, DEVFONT* sbc_devfont,
const char* mstr, int mstr_len, Glyph32* g, Uchar32* uc)
{
int mchar_len = 0;
if (mbc_devfont) {
mchar_len = mbc_devfont->charset_ops->len_first_char
((const unsigned char*)mstr, mstr_len);
if (mchar_len > 0) {
*g = mbc_devfont->charset_ops->char_glyph_value
(NULL, 0, (Uint8*)mstr, mchar_len);
*g = SET_MBC_GLYPH(*g);
if (mbc_devfont->charset_ops->conv_to_uc32)
*uc = mbc_devfont->charset_ops->conv_to_uc32(*g);
else
*uc = GLYPH2UCHAR(*g);
}
}
if (*g == INV_GLYPH_VALUE) {
mchar_len = sbc_devfont->charset_ops->len_first_char
((const unsigned char*)mstr, mstr_len);
if (mchar_len > 0) {
*g = sbc_devfont->charset_ops->char_glyph_value
(NULL, 0, (Uint8*)mstr, mchar_len);
if (sbc_devfont->charset_ops->conv_to_uc32)
*uc = sbc_devfont->charset_ops->conv_to_uc32(*g);
else
*uc = GLYPH2UCHAR(*g);
}
}
return mchar_len;
}
static UCharBreakType resolve_line_breaking_class(
LanguageCode content_language, UCharScriptType writing_system,
UCharBasicType gc, UCharBreakType bt)
{
/*
* TODO: according to the content language and the writing system
* to resolve AI, CB, CJ, SA, SG, and XX into other line breaking classes.
*/
// default handling.
switch (bt) {
case UCHAR_BREAK_AMBIGUOUS:
case UCHAR_BREAK_SURROGATE:
case UCHAR_BREAK_UNKNOWN:
bt = UCHAR_BREAK_ALPHABETIC;
break;
case UCHAR_BREAK_COMPLEX_CONTEXT:
if (gc == UCHAR_TYPE_NON_SPACING_MARK
|| gc == UCHAR_TYPE_SPACING_MARK) {
bt = UCHAR_BREAK_COMBINING_MARK;
}
else {
bt = UCHAR_BREAK_ALPHABETIC;
}
break;
case UCHAR_BREAK_CONDITIONAL_JAPANESE_STARTER:
bt = UCHAR_BREAK_NON_STARTER;
break;
default:
break;
}
return bt;
}
static int collapse_space(DEVFONT* mbc_devfont, DEVFONT* sbc_devfont,
const char* mstr, int mstr_len)
{
UCharBreakType bt;
int cosumed = 0;
do {
int mchar_len;
Glyph32 g;
Uchar32 uc;
mchar_len = get_next_glyph(mbc_devfont, sbc_devfont, mstr, mstr_len,
&g, &uc);
if (mchar_len == 0)
break;
mstr += mchar_len;
mstr_len -= mchar_len;
cosumed += mchar_len;
bt = UCharGetBreak(uc);
} while (bt == UCHAR_BREAK_SPACE);
return cosumed;
}
int GUIAPI GetGlyphsByRules(LOGFONT* logfont, const char* mstr, int mstr_len,
LanguageCode content_language, UCharScriptType writing_system,
Uint32 space_rule, Uint32 trans_rule,
@@ -78,12 +180,14 @@ int GUIAPI GetGlyphsByRules(LOGFONT* logfont, const char* mstr, int mstr_len,
Uint8* bs = NULL;
int len_buff;
int n = 0;
int ret = 0;
int cosumed = 0;
DEVFONT* sbc_devfont = logfont->sbc_devfont;
DEVFONT* mbc_devfont = logfont->mbc_devfont;
// TODO: validate length and devfonts are in UNICODE charset.
*glyphs = NULL;
*break_oppos = NULL;
*nr_glyphs = 0;
if (mstr_len == 0)
return 0;
@@ -98,41 +202,48 @@ int GUIAPI GetGlyphsByRules(LOGFONT* logfont, const char* mstr, int mstr_len,
goto error;
while (mstr_len > 0 && *mstr != '\0') {
Glyph32 g = INV_GLYPH_VALUE;
Uchar32 uc = 0;
int mchar_len;
Glyph32 g = INV_GLYPH_VALUE;
UCharBasicType gc;
UCharBreakType bt;
if (mbc_devfont) {
mchar_len = mbc_devfont->charset_ops->len_first_char
((const unsigned char*)mstr, mstr_len);
mchar_len = get_next_glyph(mbc_devfont, sbc_devfont, mstr, mstr_len,
&g, &uc);
if (mchar_len == 0)
break;
if (mchar_len > 0) {
g = mbc_devfont->charset_ops->char_glyph_value
(NULL, 0, (Uint8*)mstr, mchar_len);
g = SET_MBC_GLYPH(g);
}
else {
goto badchar;
}
gc = UCharGetType(uc);
bt = UCharGetBreak(uc);
// CSS: collapses space acoording to space rule
if ((space_rule == WSR_NORMAL || space_rule == WSR_NOWRAP)
&& bt == UCHAR_BREAK_SPACE) {
mchar_len += collapse_space(mbc_devfont, sbc_devfont, mstr,
mstr_len);
}
else {
mchar_len = sbc_devfont->charset_ops->len_first_char
((const unsigned char*)mstr, mstr_len);
if (mchar_len > 0) {
g = sbc_devfont->charset_ops->char_glyph_value
(NULL, 0, (Uint8*)mstr, mchar_len);
}
else {
goto badchar;
}
}
mstr_len -= mchar_len;
mstr += mchar_len;
cosumed += mchar_len;
gs[n] = g;
bs[n] = BOV_UNKNOWN;
// Line Breaking Algorithm goes here
if (space_rule == WSR_PRE || space_rule == WSR_NOWRAP) {
// only break at forced line breaks.
}
else {
/* Complete Line Breaking Algorithm goes here */
// check and realloc buffers
// LB1: Resolve line breaking classes
bt = resolve_line_breaking_class(content_language, writing_system,
gc, bt);
// mark all breaking opportunities
}
/* check and realloc buffers */
n++;
if (n == len_buff) {
len_buff += INC_LEN_GLYPHS;
@@ -142,22 +253,8 @@ int GUIAPI GetGlyphsByRules(LOGFONT* logfont, const char* mstr, int mstr_len,
goto error;
}
mstr_len -= mchar_len;
mstr += mchar_len;
ret += mchar_len;
}
*glyphs = gs;
*break_oppos = bs;
*nr_glyphs = n;
return 0;
error:
if (gs) free(gs);
if (bs) free(bs);
return 0;
badchar:
if (n == 0) {
if (gs) free(gs);
if (bs) free(bs);
@@ -168,7 +265,12 @@ badchar:
*nr_glyphs = n;
}
return ret;
return cosumed;
error:
if (gs) free(gs);
if (bs) free(bs);
return 0;
}
PLOGFONT GUIAPI GetGlyphsExtentPointEx (LOGFONT* logfont, int x, int y,