Skip to content

W
wine-winehq
Commit e395d4e7 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

usp10: Implement fOverrideDirection.

Signed-off-by: 's avatarAric Stewart <aric@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7d0641dd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 19 deletions
dlls/usp10/bidi.c
View file @ e395d4e7
......@@ -267,7 +267,7 @@ typedef struct tagStackItem {
#define valid_level(x) (x <= MAX_DEPTH && overflow_isolate_count == 0 && overflow_embedding_count == 0)
static void resolveExplicit(int level, WORD *pclass, WORD *poutLevel, int count)
static void resolveExplicit(int level, WORD *pclass, WORD *poutLevel, WORD *poutOverrides, int count, BOOL initialOverride)
{
/* X1 */
int overflow_isolate_count = 0;
......@@ -282,8 +282,18 @@ static void resolveExplicit(int level, WORD *pclass, WORD *poutLevel, int count)
stack[stack_top].override = NI;
stack[stack_top].isolate = FALSE;
if (initialOverride)
{
if (odd(level))
push_stack(level, R, FALSE);
else
push_stack(level, L, FALSE);
}
for (i = 0; i < count; i++)
{
poutOverrides[i] = stack[stack_top].override;
/* X2 */
if (pclass[i] == RLE)
{
......@@ -1115,7 +1125,8 @@ BOOL BIDI_DetermineLevels(
INT uCount, /* [in] Number of WCHARs in string. */
const SCRIPT_STATE *s,
const SCRIPT_CONTROL *c,
WORD *lpOutLevels /* [out] final string levels */
WORD *lpOutLevels, /* [out] final string levels */
WORD *lpOutOverrides /* [out] final string overrides */
)
{
WORD *chartype;
......@@ -1137,8 +1148,10 @@ BOOL BIDI_DetermineLevels(
classify(lpString, chartype, uCount, c);
if (TRACE_ON(bidi)) dump_types("Start ", chartype, 0, uCount);
memset(lpOutOverrides, 0, sizeof(WORD) * uCount);
/* resolve explicit */
resolveExplicit(baselevel, chartype, lpOutLevels, uCount);
resolveExplicit(baselevel, chartype, lpOutLevels, lpOutOverrides, uCount, s->fOverrideDirection);
if (TRACE_ON(bidi)) dump_types("After Explicit", chartype, 0, uCount);
/* X10/BD13: Computer Isolating runs */
......
dlls/usp10/usp10.c
View file @ e395d4e7
......@@ -1268,9 +1268,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
int New_Script = -1;
int i;
WORD *levels = NULL;
WORD *layout_levels = NULL;
WORD *overrides = NULL;
WORD *strength = NULL;
WORD *scripts = NULL;
WORD baselevel = 0;
WORD baselayout = 0;
BOOL new_run;
WORD last_indic = -1;
WORD layoutRTL = 0;
......@@ -1379,15 +1382,51 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (!levels)
goto nomemory;
BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels);
overrides = heap_alloc_zero(cInChars * sizeof(WORD));
if (!overrides)
goto nomemory;
layout_levels = heap_alloc_zero(cInChars * sizeof(WORD));
if (!layout_levels)
goto nomemory;
if (psState->fOverrideDirection)
{
if (!forceLevels)
{
SCRIPT_STATE s = *psState;
s.fOverrideDirection = FALSE;
BIDI_DetermineLevels(pwcInChars, cInChars, &s, psControl, layout_levels, overrides);
if (odd(layout_levels[0]))
forceLevels = TRUE;
else for (i = 0; i < cInChars; i++)
if (layout_levels[i]!=layout_levels[0])
{
forceLevels = TRUE;
break;
}
}
BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels, overrides);
}
else
{
BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels, overrides);
memcpy(layout_levels, levels, cInChars * sizeof(WORD));
}
baselevel = levels[0];
baselayout = layout_levels[0];
for (i = 0; i < cInChars; i++)
if (levels[i]!=levels[0])
break;
if (i >= cInChars && !odd(baselevel) && !odd(psState->uBidiLevel) && !forceLevels)
{
heap_free(levels);
heap_free(overrides);
heap_free(layout_levels);
overrides = NULL;
levels = NULL;
layout_levels = NULL;
}
else
{
......@@ -1445,7 +1484,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
for (i = 0; i < cInChars; i++)
{
/* Script_Numeric at level 0 get bumped to level 2 */
if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric)
if (!overrides[i] && (levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric)
{
levels[i] = 2;
}
......@@ -1531,19 +1570,31 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (levels)
{
if (strength[cnt] == BIDI_STRONG)
layoutRTL = (odd(levels[cnt]))?1:0;
layoutRTL = odd(layout_levels[cnt]);
else
layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0;
layoutRTL = (psState->uBidiLevel || odd(layout_levels[cnt]));
if (overrides)
pItems[index].a.s.fOverrideDirection = (overrides[cnt] != 0);
pItems[index].a.fRTL = odd(levels[cnt]);
pItems[index].a.fLayoutRTL = layoutRTL;
if (pItems[index].a.eScript == Script_Numeric ||
pItems[index].a.eScript == Script_Numeric2)
pItems[index].a.fLayoutRTL = layoutRTL;
else
pItems[index].a.fLayoutRTL = pItems[index].a.fRTL;
pItems[index].a.s.uBidiLevel = levels[cnt];
}
else if (!pItems[index].a.s.uBidiLevel)
else if (!pItems[index].a.s.uBidiLevel || (overrides && overrides[cnt]))
{
layoutRTL = (odd(baselevel))?1:0;
if (pItems[index].a.s.uBidiLevel != baselevel)
pItems[index].a.s.fOverrideDirection = TRUE;
layoutRTL = odd(baselayout);
pItems[index].a.s.uBidiLevel = baselevel;
pItems[index].a.fLayoutRTL = odd(baselevel);
pItems[index].a.fRTL = odd(baselevel);
if (pItems[index].a.eScript == Script_Numeric ||
pItems[index].a.eScript == Script_Numeric2)
pItems[index].a.fLayoutRTL = odd(baselayout);
else
pItems[index].a.fLayoutRTL = pItems[index].a.fRTL;
}
TRACE("New_Level=%i New_Strength=%i New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n",
......@@ -1594,8 +1645,10 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (!new_run && strength && str == BIDI_STRONG)
{
layoutRTL = odd(levels[cnt])?1:0;
pItems[index].a.fLayoutRTL = layoutRTL;
layoutRTL = odd(layout_levels[cnt]);
if (pItems[index].a.eScript == Script_Numeric ||
pItems[index].a.eScript == Script_Numeric2)
pItems[index].a.fLayoutRTL = layoutRTL;
}
if (new_run)
......@@ -1617,19 +1670,31 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
pScriptTags[index] = scriptInformation[New_Script].scriptTag;
if (levels)
{
if (levels[cnt] == 0)
if (overrides)
pItems[index].a.s.fOverrideDirection = (overrides[cnt] != 0);
if (layout_levels[cnt] == 0)
layoutRTL = 0;
else
layoutRTL = (layoutRTL || odd(levels[cnt]))?1:0;
layoutRTL = (layoutRTL || odd(layout_levels[cnt]));
pItems[index].a.fRTL = odd(levels[cnt]);
pItems[index].a.fLayoutRTL = layoutRTL;
if (pItems[index].a.eScript == Script_Numeric ||
pItems[index].a.eScript == Script_Numeric2)
pItems[index].a.fLayoutRTL = layoutRTL;
else
pItems[index].a.fLayoutRTL = pItems[index].a.fRTL;
pItems[index].a.s.uBidiLevel = levels[cnt];
}
else if (!pItems[index].a.s.uBidiLevel)
else if (!pItems[index].a.s.uBidiLevel || (overrides && overrides[cnt]))
{
if (pItems[index].a.s.uBidiLevel != baselevel)
pItems[index].a.s.fOverrideDirection = TRUE;
pItems[index].a.s.uBidiLevel = baselevel;
pItems[index].a.fLayoutRTL = layoutRTL;
pItems[index].a.fRTL = odd(baselevel);
if (pItems[index].a.eScript == Script_Numeric||
pItems[index].a.eScript == Script_Numeric2)
pItems[index].a.fLayoutRTL = layoutRTL;
else
pItems[index].a.fLayoutRTL = pItems[index].a.fRTL;
}
TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos);
......@@ -1653,6 +1718,8 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
res = S_OK;
nomemory:
heap_free(levels);
heap_free(overrides);
heap_free(layout_levels);
heap_free(strength);
heap_free(scripts);
return res;
......
dlls/usp10/usp10_internal.h
View file @ e395d4e7
......@@ -224,7 +224,7 @@ typedef void (*reorder_function)(LPWSTR pwChar, IndicSyllable *syllable, lexical
int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN;
BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s,
const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN;
const SCRIPT_CONTROL *c, WORD *lpOutLevels, WORD *lpOutOverrides ) DECLSPEC_HIDDEN;
BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c,
WORD* lpStrength) DECLSPEC_HIDDEN;
INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment