ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Set drawing effect for trimming sign. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-08-22 12:42:10 +03:00 committed by Alexandre Julliard
parent 7fd7960b9d
commit 5a70c58acd
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/dwrite/layout.c
View File

@ -20,6 +20,7 @@
#define COBJMACROS #define COBJMACROS
#include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#include <math.h> #include <math.h>
@ -164,8 +165,7 @@ struct regular_layout_run {
UINT16 *clustermap; UINT16 *clustermap;
FLOAT *advances; FLOAT *advances;
DWRITE_GLYPH_OFFSET *offsets; DWRITE_GLYPH_OFFSET *offsets;
/* this is actual glyph count after shaping, it's not necessary the same as reported to Draw() */ UINT32 glyphcount; /* actual glyph count after shaping, not necessarily the same as reported to Draw() */
UINT32 glyphcount;
}; };
struct layout_run { struct layout_run {
@ -177,6 +177,7 @@ struct layout_run {
} u; } u;
FLOAT baseline; FLOAT baseline;
FLOAT height; FLOAT height;
UINT32 start_position; /* run text position in range [0, layout-text-length) */
}; };
struct layout_effective_run { struct layout_effective_run {
@ -487,7 +488,7 @@ static BOOL is_run_rtl(const struct layout_effective_run *run)
return run->run->u.regular.run.bidiLevel & 1; return run->run->u.regular.run.bidiLevel & 1;
} }
static struct layout_run *alloc_layout_run(enum layout_run_kind kind) static struct layout_run *alloc_layout_run(enum layout_run_kind kind, UINT32 start_position)
{ {
struct layout_run *ret; struct layout_run *ret;
@ -500,6 +501,7 @@ static struct layout_run *alloc_layout_run(enum layout_run_kind kind)
ret->u.regular.sa.script = Script_Unknown; ret->u.regular.sa.script = Script_Unknown;
ret->u.regular.sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; ret->u.regular.sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT;
} }
ret->start_position = start_position;
return ret; return ret;
} }
@ -695,6 +697,8 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s
const struct regular_layout_run *run = &r->u.regular; const struct regular_layout_run *run = &r->u.regular;
UINT32 i, start = 0; UINT32 i, start = 0;
assert(r->kind == LAYOUT_RUN_REGULAR);
for (i = 0; i < run->descr.stringLength; i++) { for (i = 0; i < run->descr.stringLength; i++) {
BOOL end = i == run->descr.stringLength - 1; BOOL end = i == run->descr.stringLength - 1;
@ -781,7 +785,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
r = alloc_layout_run(LAYOUT_RUN_INLINE); r = alloc_layout_run(LAYOUT_RUN_INLINE, range->h.range.startPosition);
if (!r) if (!r)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -891,13 +895,14 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
struct layout_run *nextr; struct layout_run *nextr;
/* keep mapped part for current run, add another run for the rest */ /* keep mapped part for current run, add another run for the rest */
nextr = alloc_layout_run(LAYOUT_RUN_REGULAR); nextr = alloc_layout_run(LAYOUT_RUN_REGULAR, 0);
if (!nextr) if (!nextr)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
*nextr = *r; *nextr = *r;
nextr->start_position = run->descr.textPosition + mapped_length;
nextrun = &nextr->u.regular; nextrun = &nextr->u.regular;
nextrun->descr.textPosition = run->descr.textPosition + mapped_length; nextrun->descr.textPosition = nextr->start_position;
nextrun->descr.stringLength = run->descr.stringLength - mapped_length; nextrun->descr.stringLength = run->descr.stringLength - mapped_length;
nextrun->descr.string = &layout->str[nextrun->descr.textPosition]; nextrun->descr.string = &layout->str[nextrun->descr.textPosition];
run->descr.stringLength = mapped_length; run->descr.stringLength = mapped_length;
@ -1228,7 +1233,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const
inlineobject->line = line; inlineobject->line = line;
/* effect assigned from start position and on is used for inline objects */ /* effect assigned from start position and on is used for inline objects */
inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position); inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position +
layout->clusters[first_cluster].run->start_position);
list_add_tail(&layout->inlineobjects, &inlineobject->entry); list_add_tail(&layout->inlineobjects, &inlineobject->entry);
return S_OK; return S_OK;
@ -1886,7 +1892,8 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust
trimming_sign->is_rtl = FALSE; trimming_sign->is_rtl = FALSE;
trimming_sign->line = line; trimming_sign->line = line;
trimming_sign->effect = NULL; /* FIXME */ trimming_sign->effect = layout_get_effect_from_pos(layout, layout->clusters[i].position +
layout->clusters[i].run->start_position);
list_add_tail(&layout->inlineobjects, &trimming_sign->entry); list_add_tail(&layout->inlineobjects, &trimming_sign->entry);
} }
@ -4504,7 +4511,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi
TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script)); TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script));
run = alloc_layout_run(LAYOUT_RUN_REGULAR); run = alloc_layout_run(LAYOUT_RUN_REGULAR, position);
if (!run) if (!run)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -4564,7 +4571,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink
/* all fully covered runs are processed at this point, reuse existing run for remaining /* all fully covered runs are processed at this point, reuse existing run for remaining
reported bidi range and add another run for the rest of original one */ reported bidi range and add another run for the rest of original one */
run = alloc_layout_run(LAYOUT_RUN_REGULAR); run = alloc_layout_run(LAYOUT_RUN_REGULAR, position + length);
if (!run) if (!run)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;