August 2019 - Wine-devel - list.winehq.org

[PATCH v2 5/6] riched20: Use PatBlt() instead of FillRect() to paint the background area.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 18 +++++++++++------- dlls/riched20/paint.c | 36 +++++++++++++++++------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b10f719bb0..c4a6902733 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4983,42 +4983,46 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { case WM_PAINT: { - HDC hDC; + HDC hdc; RECT rc; PAINTSTRUCT ps; + HBRUSH old_brush; update_caret(editor); - hDC = BeginPaint(editor->hWnd, &ps); + hdc = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); + old_brush = SelectObject(hdc, editor->hbrBackground); + /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) { rc = ps.rcPaint; rc.bottom = editor->rcFormat.top; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.top = editor->rcFormat.top; } if (ps.rcPaint.bottom > editor->rcFormat.bottom) { rc = ps.rcPaint; rc.top = editor->rcFormat.bottom; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.bottom = editor->rcFormat.bottom; } if (ps.rcPaint.left < editor->rcFormat.left) { rc = ps.rcPaint; rc.right = editor->rcFormat.left; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.left = editor->rcFormat.left; } if (ps.rcPaint.right > editor->rcFormat.right) { rc = ps.rcPaint; rc.left = editor->rcFormat.right; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, &ps.rcPaint); + ME_PaintContent(editor, hdc, &ps.rcPaint); + SelectObject(hdc, old_brush); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94fe0516bd..7212807238 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,6 +43,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); + item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ @@ -86,7 +87,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) - FillRect(hDC, &rc, c.editor->hbrBackground); + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) @@ -597,7 +598,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); rc.bottom = y + bounds->top + top_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (para->fmt.dwMask & PFM_SPACEAFTER) @@ -607,7 +608,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); rc.top = rc.bottom - bounds->bottom - bottom_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -646,7 +647,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + border_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, c->pt.x + pen_width + 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, c->pt.x + pen_width + 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -661,7 +662,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + pen_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, rightEdge - 1 - pen_width - 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, rightEdge - 1 - pen_width - 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -725,9 +726,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (width) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. * The order borders are draw in is left, top, bottom, right in order @@ -966,18 +966,18 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (visible) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { /* If scrolled to the right past the end of the text, then * there may be space to the right of the paragraph border. */ - RECT rcAfterBrdr = rc; - rcAfterBrdr.left = rc.right + bounds.right; - rcAfterBrdr.right = c->rcView.right; - if (RectVisible(c->hDC, &rcAfterBrdr)) - FillRect(c->hDC, &rcAfterBrdr, c->editor->hbrBackground); + RECT after_bdr = rc; + after_bdr.left = rc.right + bounds.right; + after_bdr.right = c->rcView.right; + if (RectVisible(c->hDC, &after_bdr)) + PatBlt(c->hDC, after_bdr.left, after_bdr.top, after_bdr.right - after_bdr.left, + after_bdr.bottom - after_bdr.top, PATCOPY); } if (me_debug) { @@ -1026,9 +1026,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + para->nHeight; rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; if (RectVisible(c->hDC, &rc)) - { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); break; default: break; -- 2.18.0

1 0

[PATCH v2 4/6] riched20: Allow the style to remain selected in the context.
by Huw Davies 19 Aug '19

19 Aug '19

This avoids swapping out the font if the next run uses the same style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/context.c | 5 ++- dlls/riched20/editor.h | 3 +- dlls/riched20/editstr.h | 2 + dlls/riched20/paint.c | 13 ++---- dlls/riched20/para.c | 4 +- dlls/riched20/run.c | 23 +++++----- dlls/riched20/style.c | 94 +++++++++++++++++++++++------------------ dlls/riched20/wrap.c | 5 +-- 8 files changed, 75 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 2cdaeff328..66066b39e6 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -27,6 +27,8 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) c->pt.x = 0; c->pt.y = 0; c->rcView = editor->rcFormat; + c->current_style = NULL; + c->orig_font = NULL; if (hDC) { c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); @@ -41,5 +43,6 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) void ME_DestroyContext(ME_Context *c) { - if (c->hDC) ITextHost_TxReleaseDC(c->editor->texthost, c->hDC); + select_style( c, NULL ); + if (c->hDC) ITextHost_TxReleaseDC( c->editor->texthost, c->hDC ); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 800f5882a7..1f033b4187 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -53,8 +53,7 @@ void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) DECLSPEC_HIDDEN; +void select_style(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2be903b4fd..a2e6f8584b 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -457,6 +457,8 @@ typedef struct tagME_Context RECT rcView; SIZE dpi; int nAvailWidth; + ME_Style *current_style; + HFONT orig_font; /* those are valid inside ME_WrapTextParagraph and related */ ME_TextEditor *editor; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 675e0f7a12..94fe0516bd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -290,11 +290,10 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, { COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF old_text, old_back; - HFONT old_font = NULL; int y_offset = calc_y_offset( c, run->style ); static const WCHAR space[1] = {' '}; - old_font = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); old_text = SetTextColor( hdc, text_color ); if (selected) old_back = SetBkColor( hdc, back_color ); @@ -302,7 +301,6 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, if (selected) SetBkColor( hdc, old_back ); SetTextColor( hdc, old_text ); - ME_UnselectStyleFont( c, run->style, old_font ); draw_underline( c, run, x, y - y_offset, text_color ); } @@ -370,7 +368,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; - HGDIOBJ hOldFont; int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection && @@ -403,7 +400,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, } } - hOldFont = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); @@ -430,8 +427,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, if (old_style_selected) PatBlt( hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT ); - - ME_UnselectStyleFont(c, run->style, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -900,13 +895,12 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) { ME_Paragraph *para = &p->member.para; - HFONT old_font; int x, y; COLORREF old_text; if (para->fmt.wNumbering) { - old_font = ME_SelectStyleFont( c, para->para_num.style ); + select_style( c, para->para_num.style ); old_text = SetTextColor( c->hDC, get_text_color( c, para->para_num.style, FALSE ) ); x = c->pt.x + para->para_num.pt.x; @@ -915,7 +909,6 @@ static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) ExtTextOutW( c->hDC, x, y, 0, NULL, para->para_num.text->szData, para->para_num.text->nLen, NULL ); SetTextColor( c->hDC, old_text ); - ME_UnselectStyleFont( c, para->para_num.style, old_font ); } } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 5b6cf77010..79f83573bf 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -399,7 +399,6 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; static const WCHAR bullet_str[] = {0xb7, 0}; static const WCHAR spaceW[] = {' ', 0}; - HFONT old_font; SIZE sz; if (para->para_num.style && para->para_num.text) return; @@ -432,12 +431,11 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); } - old_font = ME_SelectStyleFont( c, para->para_num.style ); + select_style( c, para->para_num.style ); GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); para->para_num.width = sz.cx; GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); para->para_num.width += sz.cx; - ME_UnselectStyleFont( c, para->para_num.style, old_font ); } void para_num_clear( struct para_num *pn ) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 6772e2f763..b5408320ca 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -459,7 +459,6 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO ME_String *mask_text = NULL; WCHAR *str; int fit = 0; - HGDIOBJ hOldFont; SIZE sz, sz2, sz3; if (!run->len || cx <= 0) return 0; @@ -498,7 +497,7 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO else str = get_text( run, 0 ); - hOldFont = ME_SelectStyleFont(c, run->style); + select_style(c, run->style); GetTextExtentExPointW(c->hDC, str, run->len, cx, &fit, NULL, &sz); if (closest && fit != run->len) @@ -511,7 +510,6 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO ME_DestroyString( mask_text ); - ME_UnselectStyleFont(c, run->style, hOldFont); return fit; } @@ -533,15 +531,16 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B */ static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style *s, SIZE *size) { - HGDIOBJ hOldFont; - if (c->hDC) { - hOldFont = ME_SelectStyleFont(c, s); - GetTextExtentPoint32W(c->hDC, szText, nChars, size); - ME_UnselectStyleFont(c, s, hOldFont); - } else { - size->cx = 0; - size->cy = 0; - } + if (c->hDC) + { + select_style( c, s ); + GetTextExtentPoint32W( c->hDC, szText, nChars, size ); + } + else + { + size->cx = 0; + size->cy = 0; + } } /****************************************************************************** diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index fca0cef6b3..8b9c2126b1 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -366,67 +366,77 @@ static void release_font_cache(ME_FontCacheItem *item) } } -HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) +void select_style( ME_Context *c, ME_Style *s ) { HFONT old_font; LOGFONTW lf; int i, empty, age = 0x7FFFFFFF; ME_FontCacheItem *item; - assert( s ); + if (c->current_style == s) return; - ME_LogFontFromStyle( c, &lf, s ); - - for (i = 0; i < HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) + if (s) { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - if (item->nAge > age) + item = &c->editor->pFontCache[i]; + if (!item->nRefs) { - empty = i; - age = item->nAge; + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; } - if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) - break; + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; + } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + if (!c->orig_font) c->orig_font = old_font; } - - if (i < HFONT_CACHE_SIZE) /* found */ + else { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)( "font reused %d\n", i ); - item->nRefs++; + SelectObject( c->hDC, c->orig_font ); + c->orig_font = NULL; } - else + + if (c->current_style) { - assert(empty != -1); - item = &c->editor->pFontCache[empty]; - if (item->hFont) - { - TRACE_(richedit_style)( "font deleted %d\n", empty ); - DeleteObject(item->hFont); - item->hFont = NULL; - } - item->hFont = CreateFontIndirectW( &lf ); - TRACE_(richedit_style)( "font created %d\n", empty ); - item->nRefs = 1; - item->lfSpecs = lf; + release_font_cache( c->current_style->font_cache ); + c->current_style->font_cache = NULL; } - s->font_cache = item; - old_font = SelectObject( c->hDC, item->hFont ); - GetTextMetricsW( c->hDC, &s->tm ); - return old_font; -} + c->current_style = s; -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) -{ - SelectObject(c->hDC, hOldFont); - release_font_cache(s->font_cache); - s->font_cache = NULL; + return; } void ME_DestroyStyle(ME_Style *s) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a66137d42c..c3b5883dbf 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -65,7 +65,6 @@ static BOOL get_run_glyph_buffers( ME_Run *run ) static HRESULT shape_run( ME_Context *c, ME_Run *run ) { HRESULT hr; - HFONT old_font; int i; if (!run->glyphs) @@ -82,7 +81,7 @@ static HRESULT shape_run( ME_Context *c, ME_Run *run ) run->clusters = heap_alloc( run->max_clusters * sizeof(WORD) ); } - old_font = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); while (1) { hr = ScriptShape( c->hDC, &run->style->script_cache, get_text( run, 0 ), run->len, run->max_glyphs, @@ -103,8 +102,6 @@ static HRESULT shape_run( ME_Context *c, ME_Run *run ) run->nWidth += run->advances[i]; } - ME_UnselectStyleFont( c, run->style, old_font ); - return hr; } -- 2.18.0

1 0

[PATCH v2 3/6] riched20: Move release_font_cache() further up the file.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/style.c | 105 ++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1be1c15a15..fca0cef6b3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -357,64 +357,69 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) return TRUE; } -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) +static void release_font_cache(ME_FontCacheItem *item) { - HFONT hOldFont; - LOGFONTW lf; - int i, nEmpty, nAge = 0x7FFFFFFF; - ME_FontCacheItem *item; - assert(s); - - ME_LogFontFromStyle(c, &lf, s); - - for (i=0; i<HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i=0, nEmpty=-1, nAge=0; i<HFONT_CACHE_SIZE; i++) - { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + if (item->nRefs > 0) { - if (item->nAge > nAge) - nEmpty = i, nAge = item->nAge; - } - if (item->hFont && ME_IsFontEqual(&item->lfSpecs, &lf)) - break; - } - if (i < HFONT_CACHE_SIZE) /* found */ - { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)("font reused %d\n", i); - item->nRefs++; - } - else - { - item = &c->editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ - - assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ - if (item->hFont) { - TRACE_(richedit_style)("font deleted %d\n", nEmpty); - DeleteObject(item->hFont); - item->hFont = NULL; + item->nRefs--; + item->nAge = 0; } - item->hFont = CreateFontIndirectW(&lf); - TRACE_(richedit_style)("font created %d\n", nEmpty); - item->nRefs = 1; - item->lfSpecs = lf; - } - s->font_cache = item; - hOldFont = SelectObject(c->hDC, item->hFont); - /* should be cached too, maybe ? */ - GetTextMetricsW(c->hDC, &s->tm); - return hOldFont; } -static void release_font_cache(ME_FontCacheItem *item) +HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) { - if (item->nRefs > 0) + HFONT old_font; + LOGFONTW lf; + int i, empty, age = 0x7FFFFFFF; + ME_FontCacheItem *item; + + assert( s ); + + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - item->nRefs--; - item->nAge = 0; + item = &c->editor->pFontCache[i]; + if (!item->nRefs) + { + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } + } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; + } + + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + return old_font; } void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) -- 2.18.0

1 0

[PATCH v2 2/6] riched20: Only invalidate the selection if it's not hidden.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 118c64652e..b10f719bb0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2153,9 +2153,9 @@ int set_selection( ME_TextEditor *editor, int to, int from ) TRACE("%d - %d\n", to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); -- 2.18.0

1 0

[PATCH v2 1/6] riched20: Clearly separate the selection setting functions.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 13 ++++++++----- dlls/riched20/editor.c | 22 +++++++++++----------- dlls/riched20/editor.h | 3 ++- dlls/riched20/richole.c | 8 ++++---- dlls/riched20/txtsrv.c | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0951bb9617..212c9e9f99 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -122,8 +122,14 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) return length; } - -int ME_SetSelection(ME_TextEditor *editor, int from, int to) +/****************************************************************** + * set_selection_cursors + * + * Updates the selection cursors. + * + * Note that this does not invalidate either the old or the new selections. + */ +int set_selection_cursors(ME_TextEditor *editor, int from, int to) { int selectionEnd = 0; const int len = ME_GetTextLength(editor); @@ -139,7 +145,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); - ME_InvalidateSelection(editor); return len + 1; } @@ -165,7 +170,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) end --; } editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); } return end; } @@ -194,7 +198,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; - ME_InvalidateSelection(editor); return len; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 61f7a0e66b..118c64652e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1622,7 +1622,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } else { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_InternalDeleteText(editor, &editor->pCursors[1], ME_GetTextLength(editor), FALSE); from = to = 0; @@ -1756,9 +1756,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre cf.dwMask = CFM_ALL2; ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); - ME_SetSelection(editor, newto, -1); + set_selection_cursors(editor, newto, -1); ME_SetSelectionCharFormat(editor, &cf); - ME_SetSelection(editor, newto, newto); + set_selection_cursors(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); @@ -1781,7 +1781,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_CursorFromCharOfs(editor, from, &start); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -2147,14 +2147,14 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, } } -static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) +int set_selection( ME_TextEditor *editor, int to, int from ) { int end; TRACE("%d - %d\n", to, from ); ME_InvalidateSelection( editor ); - end = ME_SetSelection( editor, to, from ); + end = set_selection_cursors( editor, to, from ); ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); @@ -2682,7 +2682,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'A': if (ctrl_is_down) { - handle_EM_EXSETSEL( editor, 0, -1 ); + set_selection( editor, 0, -1 ); return TRUE; } break; @@ -3796,7 +3796,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - return handle_EM_EXSETSEL( editor, wParam, lParam ); + return set_selection( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { @@ -3821,7 +3821,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { CHARRANGE range = *(CHARRANGE *)lParam; - return handle_EM_EXSETSEL( editor, range.cpMin, range.cpMax ); + return set_selection( editor, range.cpMin, range.cpMax ); } case EM_SHOWSCROLLBAR: { @@ -4122,7 +4122,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, TRACE("WM_SETTEXT - NULL\n"); ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); @@ -4813,7 +4813,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) - ME_SetSelection(editor,editor->imeStartIndex, + set_selection_cursors(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f56d2a25de..800f5882a7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -149,7 +149,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; +int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; @@ -255,6 +255,7 @@ void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; +int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5a102a7607..4e8d450add 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2149,7 +2149,7 @@ static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) if (!This->child.reole) return CO_E_RELEASED; - ME_SetSelection(This->child.reole->editor, This->start, This->end); + set_selection(This->child.reole->editor, This->start, This->end); return S_OK; } @@ -4649,7 +4649,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setstart(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4684,7 +4684,7 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setend(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4803,7 +4803,7 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hres = range_Collapse(bStart, &start, &end); if (SUCCEEDED(hres)) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hres; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 9ce1d47601..12761621c4 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -290,7 +290,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText(ITextServices *iface, LPC ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); if(pszText) ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); - ME_SetSelection(This->editor, 0, 0); + set_selection_cursors(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard(); ME_EmptyUndoStack(This->editor); -- 2.18.0

1 0

[PATCH 5/6] riched20: Use PatBlt() instead of FillRect() to paint the background area.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 18 +++++++++++------- dlls/riched20/paint.c | 27 ++++++++++++--------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b10f719bb0..c4a6902733 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4983,42 +4983,46 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { case WM_PAINT: { - HDC hDC; + HDC hdc; RECT rc; PAINTSTRUCT ps; + HBRUSH old_brush; update_caret(editor); - hDC = BeginPaint(editor->hWnd, &ps); + hdc = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); + old_brush = SelectObject(hdc, editor->hbrBackground); + /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) { rc = ps.rcPaint; rc.bottom = editor->rcFormat.top; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.top = editor->rcFormat.top; } if (ps.rcPaint.bottom > editor->rcFormat.bottom) { rc = ps.rcPaint; rc.top = editor->rcFormat.bottom; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.bottom = editor->rcFormat.bottom; } if (ps.rcPaint.left < editor->rcFormat.left) { rc = ps.rcPaint; rc.right = editor->rcFormat.left; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.left = editor->rcFormat.left; } if (ps.rcPaint.right > editor->rcFormat.right) { rc = ps.rcPaint; rc.left = editor->rcFormat.right; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, &ps.rcPaint); + ME_PaintContent(editor, hdc, &ps.rcPaint); + SelectObject(hdc, old_brush); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94fe0516bd..fe27932719 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,6 +43,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); + item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ @@ -86,7 +87,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) - FillRect(hDC, &rc, c.editor->hbrBackground); + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) @@ -597,7 +598,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); rc.bottom = y + bounds->top + top_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (para->fmt.dwMask & PFM_SPACEAFTER) @@ -607,7 +608,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); rc.top = rc.bottom - bounds->bottom - bottom_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -646,7 +647,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + border_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, c->pt.x + pen_width + 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, c->pt.x + pen_width + 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -661,7 +662,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + pen_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, rightEdge - 1 - pen_width - 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, rightEdge - 1 - pen_width - 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -725,9 +726,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (width) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. * The order borders are draw in is left, top, bottom, right in order @@ -966,9 +966,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (visible) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { /* If scrolled to the right past the end of the text, then @@ -977,7 +976,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rcAfterBrdr.left = rc.right + bounds.right; rcAfterBrdr.right = c->rcView.right; if (RectVisible(c->hDC, &rcAfterBrdr)) - FillRect(c->hDC, &rcAfterBrdr, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (me_debug) { @@ -1026,9 +1025,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + para->nHeight; rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; if (RectVisible(c->hDC, &rc)) - { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); break; default: break; -- 2.18.0

1 1

[PATCH 6/6] riched20: Don't calculate the para numbering data if numbering is disabled.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 79f83573bf..bde0654b66 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -401,6 +401,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) static const WCHAR spaceW[] = {' ', 0}; SIZE sz; + if (!para->fmt.wNumbering) return; if (para->para_num.style && para->para_num.text) return; if (!para->para_num.style) -- 2.18.0

1 0

[PATCH 4/6] riched20: Allow the style to remain selected in the context.
by Huw Davies 19 Aug '19

19 Aug '19

This avoids swapping out the font if the next run uses the same style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/context.c | 5 ++- dlls/riched20/editor.h | 3 +- dlls/riched20/editstr.h | 2 + dlls/riched20/paint.c | 13 ++---- dlls/riched20/para.c | 4 +- dlls/riched20/run.c | 23 +++++----- dlls/riched20/style.c | 94 +++++++++++++++++++++++------------------ dlls/riched20/wrap.c | 5 +-- 8 files changed, 75 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 2cdaeff328..66066b39e6 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -27,6 +27,8 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) c->pt.x = 0; c->pt.y = 0; c->rcView = editor->rcFormat; + c->current_style = NULL; + c->orig_font = NULL; if (hDC) { c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); @@ -41,5 +43,6 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) void ME_DestroyContext(ME_Context *c) { - if (c->hDC) ITextHost_TxReleaseDC(c->editor->texthost, c->hDC); + select_style( c, NULL ); + if (c->hDC) ITextHost_TxReleaseDC( c->editor->texthost, c->hDC ); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 800f5882a7..1f033b4187 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -53,8 +53,7 @@ void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) DECLSPEC_HIDDEN; +void select_style(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2be903b4fd..a2e6f8584b 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -457,6 +457,8 @@ typedef struct tagME_Context RECT rcView; SIZE dpi; int nAvailWidth; + ME_Style *current_style; + HFONT orig_font; /* those are valid inside ME_WrapTextParagraph and related */ ME_TextEditor *editor; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 675e0f7a12..94fe0516bd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -290,11 +290,10 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, { COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF old_text, old_back; - HFONT old_font = NULL; int y_offset = calc_y_offset( c, run->style ); static const WCHAR space[1] = {' '}; - old_font = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); old_text = SetTextColor( hdc, text_color ); if (selected) old_back = SetBkColor( hdc, back_color ); @@ -302,7 +301,6 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, if (selected) SetBkColor( hdc, old_back ); SetTextColor( hdc, old_text ); - ME_UnselectStyleFont( c, run->style, old_font ); draw_underline( c, run, x, y - y_offset, text_color ); } @@ -370,7 +368,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; - HGDIOBJ hOldFont; int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection && @@ -403,7 +400,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, } } - hOldFont = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); @@ -430,8 +427,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, if (old_style_selected) PatBlt( hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT ); - - ME_UnselectStyleFont(c, run->style, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -900,13 +895,12 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) { ME_Paragraph *para = &p->member.para; - HFONT old_font; int x, y; COLORREF old_text; if (para->fmt.wNumbering) { - old_font = ME_SelectStyleFont( c, para->para_num.style ); + select_style( c, para->para_num.style ); old_text = SetTextColor( c->hDC, get_text_color( c, para->para_num.style, FALSE ) ); x = c->pt.x + para->para_num.pt.x; @@ -915,7 +909,6 @@ static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) ExtTextOutW( c->hDC, x, y, 0, NULL, para->para_num.text->szData, para->para_num.text->nLen, NULL ); SetTextColor( c->hDC, old_text ); - ME_UnselectStyleFont( c, para->para_num.style, old_font ); } } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 5b6cf77010..79f83573bf 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -399,7 +399,6 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; static const WCHAR bullet_str[] = {0xb7, 0}; static const WCHAR spaceW[] = {' ', 0}; - HFONT old_font; SIZE sz; if (para->para_num.style && para->para_num.text) return; @@ -432,12 +431,11 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); } - old_font = ME_SelectStyleFont( c, para->para_num.style ); + select_style( c, para->para_num.style ); GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); para->para_num.width = sz.cx; GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); para->para_num.width += sz.cx; - ME_UnselectStyleFont( c, para->para_num.style, old_font ); } void para_num_clear( struct para_num *pn ) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 6772e2f763..b5408320ca 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -459,7 +459,6 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO ME_String *mask_text = NULL; WCHAR *str; int fit = 0; - HGDIOBJ hOldFont; SIZE sz, sz2, sz3; if (!run->len || cx <= 0) return 0; @@ -498,7 +497,7 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO else str = get_text( run, 0 ); - hOldFont = ME_SelectStyleFont(c, run->style); + select_style(c, run->style); GetTextExtentExPointW(c->hDC, str, run->len, cx, &fit, NULL, &sz); if (closest && fit != run->len) @@ -511,7 +510,6 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO ME_DestroyString( mask_text ); - ME_UnselectStyleFont(c, run->style, hOldFont); return fit; } @@ -533,15 +531,16 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B */ static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style *s, SIZE *size) { - HGDIOBJ hOldFont; - if (c->hDC) { - hOldFont = ME_SelectStyleFont(c, s); - GetTextExtentPoint32W(c->hDC, szText, nChars, size); - ME_UnselectStyleFont(c, s, hOldFont); - } else { - size->cx = 0; - size->cy = 0; - } + if (c->hDC) + { + select_style( c, s ); + GetTextExtentPoint32W( c->hDC, szText, nChars, size ); + } + else + { + size->cx = 0; + size->cy = 0; + } } /****************************************************************************** diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index fca0cef6b3..8b9c2126b1 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -366,67 +366,77 @@ static void release_font_cache(ME_FontCacheItem *item) } } -HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) +void select_style( ME_Context *c, ME_Style *s ) { HFONT old_font; LOGFONTW lf; int i, empty, age = 0x7FFFFFFF; ME_FontCacheItem *item; - assert( s ); + if (c->current_style == s) return; - ME_LogFontFromStyle( c, &lf, s ); - - for (i = 0; i < HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) + if (s) { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - if (item->nAge > age) + item = &c->editor->pFontCache[i]; + if (!item->nRefs) { - empty = i; - age = item->nAge; + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; } - if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) - break; + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; + } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + if (!c->orig_font) c->orig_font = old_font; } - - if (i < HFONT_CACHE_SIZE) /* found */ + else { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)( "font reused %d\n", i ); - item->nRefs++; + SelectObject( c->hDC, c->orig_font ); + c->orig_font = NULL; } - else + + if (c->current_style) { - assert(empty != -1); - item = &c->editor->pFontCache[empty]; - if (item->hFont) - { - TRACE_(richedit_style)( "font deleted %d\n", empty ); - DeleteObject(item->hFont); - item->hFont = NULL; - } - item->hFont = CreateFontIndirectW( &lf ); - TRACE_(richedit_style)( "font created %d\n", empty ); - item->nRefs = 1; - item->lfSpecs = lf; + release_font_cache( c->current_style->font_cache ); + c->current_style->font_cache = NULL; } - s->font_cache = item; - old_font = SelectObject( c->hDC, item->hFont ); - GetTextMetricsW( c->hDC, &s->tm ); - return old_font; -} + c->current_style = s; -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) -{ - SelectObject(c->hDC, hOldFont); - release_font_cache(s->font_cache); - s->font_cache = NULL; + return; } void ME_DestroyStyle(ME_Style *s) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a66137d42c..c3b5883dbf 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -65,7 +65,6 @@ static BOOL get_run_glyph_buffers( ME_Run *run ) static HRESULT shape_run( ME_Context *c, ME_Run *run ) { HRESULT hr; - HFONT old_font; int i; if (!run->glyphs) @@ -82,7 +81,7 @@ static HRESULT shape_run( ME_Context *c, ME_Run *run ) run->clusters = heap_alloc( run->max_clusters * sizeof(WORD) ); } - old_font = ME_SelectStyleFont( c, run->style ); + select_style( c, run->style ); while (1) { hr = ScriptShape( c->hDC, &run->style->script_cache, get_text( run, 0 ), run->len, run->max_glyphs, @@ -103,8 +102,6 @@ static HRESULT shape_run( ME_Context *c, ME_Run *run ) run->nWidth += run->advances[i]; } - ME_UnselectStyleFont( c, run->style, old_font ); - return hr; } -- 2.18.0

1 0

[PATCH 3/6] riched20: Move release_font_cache() further up the file.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/style.c | 105 ++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1be1c15a15..fca0cef6b3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -357,64 +357,69 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) return TRUE; } -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) +static void release_font_cache(ME_FontCacheItem *item) { - HFONT hOldFont; - LOGFONTW lf; - int i, nEmpty, nAge = 0x7FFFFFFF; - ME_FontCacheItem *item; - assert(s); - - ME_LogFontFromStyle(c, &lf, s); - - for (i=0; i<HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i=0, nEmpty=-1, nAge=0; i<HFONT_CACHE_SIZE; i++) - { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + if (item->nRefs > 0) { - if (item->nAge > nAge) - nEmpty = i, nAge = item->nAge; - } - if (item->hFont && ME_IsFontEqual(&item->lfSpecs, &lf)) - break; - } - if (i < HFONT_CACHE_SIZE) /* found */ - { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)("font reused %d\n", i); - item->nRefs++; - } - else - { - item = &c->editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ - - assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ - if (item->hFont) { - TRACE_(richedit_style)("font deleted %d\n", nEmpty); - DeleteObject(item->hFont); - item->hFont = NULL; + item->nRefs--; + item->nAge = 0; } - item->hFont = CreateFontIndirectW(&lf); - TRACE_(richedit_style)("font created %d\n", nEmpty); - item->nRefs = 1; - item->lfSpecs = lf; - } - s->font_cache = item; - hOldFont = SelectObject(c->hDC, item->hFont); - /* should be cached too, maybe ? */ - GetTextMetricsW(c->hDC, &s->tm); - return hOldFont; } -static void release_font_cache(ME_FontCacheItem *item) +HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) { - if (item->nRefs > 0) + HFONT old_font; + LOGFONTW lf; + int i, empty, age = 0x7FFFFFFF; + ME_FontCacheItem *item; + + assert( s ); + + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - item->nRefs--; - item->nAge = 0; + item = &c->editor->pFontCache[i]; + if (!item->nRefs) + { + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } + } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; + } + + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + return old_font; } void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) -- 2.18.0

1 0

[PATCH 2/6] riched20: Only invalidate the selection if it's not hidden.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 118c64652e..b10f719bb0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2153,9 +2153,9 @@ int set_selection( ME_TextEditor *editor, int to, int from ) TRACE("%d - %d\n", to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); -- 2.18.0

1 0