Sven Baars : d3dx9: Add a helper for computing the bounding rectangle in ID3DXFont_DrawText.
Alexandre Julliard
julliard at winehq.org
Wed Apr 1 15:50:59 CDT 2020
Module: wine
Branch: master
Commit: 53769e7bde9cfb808e26cf67057314c2ca03345a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=53769e7bde9cfb808e26cf67057314c2ca03345a
Author: Sven Baars <sbaars at codeweavers.com>
Date: Wed Apr 1 20:27:13 2020 +0200
d3dx9: Add a helper for computing the bounding rectangle in ID3DXFont_DrawText.
Signed-off-by: Sven Baars <sbaars at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/font.c | 154 ++++++++++++++++++++++++++++++---------------------
1 file changed, 91 insertions(+), 63 deletions(-)
diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
index ebbda69580..603c7c25a1 100644
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -599,17 +599,46 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count,
return NULL;
}
+static int compute_rect(struct d3dx_font *font, const WCHAR *string, unsigned int count,
+ WCHAR *line, RECT *rect, DWORD format)
+{
+ int y, lh, width, top = rect->top;
+ int max_width = 0;
+ SIZE size;
+
+ y = rect->top;
+ lh = font->metrics.tmHeight;
+ width = rect->right - rect->left;
+
+ while (string)
+ {
+ unsigned int line_len;
+
+ string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size);
+
+ if (size.cx > max_width)
+ max_width = size.cx;
+
+ y += lh;
+ if (!(format & DT_NOCLIP) && (y > rect->bottom))
+ break;
+ }
+
+ rect->right = rect->left + max_width;
+ rect->bottom = y;
+
+ return rect->bottom - top;
+}
+
static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
const WCHAR *string, INT in_count, RECT *rect, DWORD format, D3DCOLOR color)
{
struct d3dx_font *font = impl_from_ID3DXFont(iface);
+ int lh, x, y, width, top, ret = 0;
ID3DXSprite *target = sprite;
- RECT textrect = {0};
- int lh, x, y, width;
unsigned int count;
- int max_width = 0;
+ RECT r = {0};
WCHAR *line;
- int ret = 0;
SIZE size;
TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#x, color 0x%08x.\n",
@@ -629,20 +658,36 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
if (format & DT_SINGLELINE)
format &= ~DT_WORDBREAK;
- if (rect)
- textrect = *rect;
-
- x = textrect.left;
- y = textrect.top;
- width = textrect.right - textrect.left;
-
- lh = font->metrics.tmHeight;
-
line = heap_alloc(count * sizeof(*line));
if (!line)
return 0;
- if (!(format & DT_CALCRECT) && !sprite)
+ if (!rect || format & DT_CALCRECT)
+ {
+ if (!rect)
+ {
+ rect = &r;
+ format |= DT_NOCLIP;
+ }
+
+ top = rect->top;
+
+ ret = compute_rect(font, string, count, line, rect, format);
+
+ if (format & DT_CALCRECT)
+ goto cleanup;
+ }
+ else
+ {
+ top = rect->top;
+ }
+
+ x = rect->left;
+ y = rect->top;
+ lh = font->metrics.tmHeight;
+ width = rect->right - rect->left;
+
+ if (!sprite)
{
D3DXCreateSprite(font->device, &target);
ID3DXSprite_Begin(target, 0);
@@ -650,72 +695,55 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
while (string)
{
- unsigned int line_len;
+ unsigned int line_len, i;
+ GCP_RESULTSW results;
+ D3DXVECTOR3 pos;
string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size);
- if (!(format & DT_CALCRECT))
- {
- GCP_RESULTSW results;
- D3DXVECTOR3 pos;
- unsigned int i;
-
- memset(&results, 0, sizeof(results));
- results.nGlyphs = line_len;
+ memset(&results, 0, sizeof(results));
+ results.nGlyphs = line_len;
- results.lpCaretPos = heap_alloc(line_len * sizeof(*results.lpCaretPos));
- if (!results.lpCaretPos)
- goto cleanup;
+ results.lpCaretPos = heap_alloc(line_len * sizeof(*results.lpCaretPos));
+ if (!results.lpCaretPos)
+ goto cleanup;
- results.lpGlyphs = heap_alloc(line_len * sizeof(*results.lpGlyphs));
- if (!results.lpGlyphs)
- {
- heap_free(results.lpCaretPos);
- goto cleanup;
- }
-
- GetCharacterPlacementW(font->hdc, line, line_len, 0, &results, 0);
+ results.lpGlyphs = heap_alloc(line_len * sizeof(*results.lpGlyphs));
+ if (!results.lpGlyphs)
+ {
+ heap_free(results.lpCaretPos);
+ goto cleanup;
+ }
- for (i = 0; i < results.nGlyphs; ++i)
- {
- IDirect3DTexture9 *texture;
- POINT cell_inc;
- RECT black_box;
+ GetCharacterPlacementW(font->hdc, line, line_len, 0, &results, 0);
- ID3DXFont_GetGlyphData(iface, results.lpGlyphs[i], &texture, &black_box, &cell_inc);
+ for (i = 0; i < results.nGlyphs; ++i)
+ {
+ IDirect3DTexture9 *texture;
+ POINT cell_inc;
+ RECT black_box;
- if (!texture)
- continue;
+ ID3DXFont_GetGlyphData(iface, results.lpGlyphs[i], &texture, &black_box, &cell_inc);
- pos.x = cell_inc.x + x + results.lpCaretPos[i];
- pos.y = cell_inc.y + y;
+ if (!texture)
+ continue;
- ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color);
- IDirect3DTexture9_Release(texture);
- }
+ pos.x = cell_inc.x + x + results.lpCaretPos[i];
+ pos.y = cell_inc.y + y;
- heap_free(results.lpCaretPos);
- heap_free(results.lpGlyphs);
- }
- else if (size.cx > max_width)
- {
- max_width = size.cx;
+ ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color);
+ IDirect3DTexture9_Release(texture);
}
+ heap_free(results.lpCaretPos);
+ heap_free(results.lpGlyphs);
+
y += lh;
- if (!(DT_NOCLIP & format) && (y > textrect.bottom))
+ if (!(DT_NOCLIP & format) && (y > rect->bottom))
break;
}
- if (format & DT_CALCRECT && rect)
- {
- *rect = textrect;
-
- rect->bottom = y;
- rect->right = rect->left + max_width;
- }
-
- ret = y - textrect.top;
+ ret = y - top;
cleanup:
if (target != sprite)
More information about the wine-cvs
mailing list