system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fully implement DrawTextEx* functions.

Browse source
This commit is contained in:
Travis Michielsen 2001-07-26 20:10:40 +00:00 committed by Alexandre Julliard
parent 40734af751
commit 188b32b73f
2 changed files with 69 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
dlls/user/text.c
View file

@ -225,8 +225,8 @@ INT16 WINAPI DrawText16( HDC16 hdc, LPCSTR str, INT16 count, LPRECT16 rect, UINT
* DrawTextExW (USER32.@) * DrawTextExW (USER32.@)
*/ */
#define MAX_STATIC_BUFFER 1024 #define MAX_STATIC_BUFFER 1024
INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count, INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
{ {
SIZE size; SIZE size;
const WCHAR *strPtr; const WCHAR *strPtr;
@ -235,6 +235,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
int prefix_x = 0; int prefix_x = 0;
int prefix_end = 0; int prefix_end = 0;
TEXTMETRICW tm; TEXTMETRICW tm;
int lmargin = 0, rmargin = 0;
int x = rect->left, y = rect->top; int x = rect->left, y = rect->top;
int width = rect->right - rect->left; int width = rect->right - rect->left;
int max_width = 0; int max_width = 0;
@ -242,10 +243,8 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count, TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count,
rect->left, rect->top, rect->right, rect->bottom); rect->left, rect->top, rect->right, rect->bottom);
if(dtp) { if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n",
FIXME("Ignores params:%d,%d,%d,%d\n", dtp->cbSize, dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin);
dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin);
}
if (!str) return 0; if (!str) return 0;
if (count == -1) count = strlenW(str); if (count == -1) count = strlenW(str);
@ -258,8 +257,17 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
else else
lh = tm.tmHeight; lh = tm.tmHeight;
if (dtp)
{
lmargin = dtp->iLeftMargin * tm.tmAveCharWidth;
rmargin = dtp->iRightMargin * tm.tmAveCharWidth;
if (!(flags & (DT_CENTER | DT_RIGHT)))
x += lmargin;
dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */
}
if (flags & DT_TABSTOP) if (flags & DT_TABSTOP)
tabstop = flags >> 8; tabstop = dtp ? dtp->iTabLength : flags >> 8;
if (flags & DT_EXPANDTABS) if (flags & DT_EXPANDTABS)
{ {
@ -292,7 +300,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
if (flags & DT_SINGLELINE) if (flags & DT_SINGLELINE)
{ {
if (flags & DT_VCENTER) y = rect->top + if (flags & DT_VCENTER) y = rect->top +
(rect->bottom - rect->top) / 2 - size.cy / 2; (rect->bottom - rect->top) / 2 - size.cy / 2;
else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; else if (flags & DT_BOTTOM) y = rect->bottom - size.cy;
@ -312,7 +320,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
if (flags & DT_WORD_ELLIPSIS) if (flags & DT_WORD_ELLIPSIS)
flags |= DT_WORDBREAK; flags |= DT_WORDBREAK;
if (flags & DT_PATH_ELLIPSIS) if (flags & DT_PATH_ELLIPSIS)
{ {
WCHAR* lastBkSlash = NULL; WCHAR* lastBkSlash = NULL;
WCHAR* lastFwdSlash = NULL; WCHAR* lastFwdSlash = NULL;
@ -320,14 +328,11 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
line[totalLen] = '\0'; line[totalLen] = '\0';
lastBkSlash = strrchrW(line, BACK_SLASHW[0]); lastBkSlash = strrchrW(line, BACK_SLASHW[0]);
lastFwdSlash = strrchrW(line, FORWARD_SLASHW[0]); lastFwdSlash = strrchrW(line, FORWARD_SLASHW[0]);
fnameDelim = lastFwdSlash ? lastFwdSlash : lastBkSlash; fnameDelim = lastBkSlash > lastFwdSlash ? lastBkSlash : lastFwdSlash;
if (lastBkSlash && lastFwdSlash) /* which is last? */
if (lastBkSlash > lastFwdSlash)
fnameDelim = lastBkSlash;
if (fnameDelim) if (fnameDelim)
fnameLen = &line[totalLen] - fnameDelim; fnameLen = &line[totalLen] - fnameDelim;
else else
fnameDelim = (WCHAR*)str; fnameDelim = (WCHAR*)str;
strcpyW(swapStr, ELLIPSISW); strcpyW(swapStr, ELLIPSISW);
@ -343,16 +348,16 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
} }
len = MAX_STATIC_BUFFER; len = MAX_STATIC_BUFFER;
TEXT_NextLineW(hdc, swapStr, &count, line, &len, width, flags); TEXT_NextLineW(hdc, swapStr, &count, line, &len, width, flags);
/* if only the ELLIPSIS will fit, just let it be clipped */ /* if only the ELLIPSIS will fit, just let it be clipped */
len = max(3, len); len = max(3, len);
GetTextExtentPointW(hdc, line, len, &size); GetTextExtentPointW(hdc, line, len, &size);
/* FIXME: /* FIXME:
* NextLine uses GetTextExtentPoint for each character, * NextLine uses GetTextExtentPoint for each character,
* rather than GetCharABCWidth... So the whitespace between * rather than GetCharABCWidth... So the whitespace between
* characters is ignored in the width measurement, and the * characters is ignored in the width measurement, and the
* reported len is too great. To compensate, we must get * reported len is too great. To compensate, we must get
* the width of the entire line and adjust len accordingly. * the width of the entire line and adjust len accordingly.
*/ */
@ -365,10 +370,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
if (fnameLen < len-3) /* some of the path will fit */ if (fnameLen < len-3) /* some of the path will fit */
{ {
/* put the ELLIPSIS between the path and filename */ /* put the ELLIPSIS between the path and filename */
strncpyW(swapStr, &line[fnameLen+3], len-3-fnameLen); strncpyW(swapStr, &line[fnameLen+3], len-3-fnameLen);
swapStr[len-3-fnameLen] = '\0'; swapStr[len-3-fnameLen] = '\0';
strcatW(swapStr, ELLIPSISW); strcatW(swapStr, ELLIPSISW);
strncpyW(swapStr+strlenW(swapStr), &line[3], fnameLen); strncpyW(swapStr+strlenW(swapStr), &line[3], fnameLen);
} }
else else
{ {
@ -382,12 +387,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
line[len] = '\0'; line[len] = '\0';
strPtr = NULL; strPtr = NULL;
} }
if (flags & DT_MODIFYSTRING)
strcpyW(str, swapStr);
} }
} }
if (!(flags & DT_CALCRECT)) if (!(flags & DT_CALCRECT))
{ {
if (!ExtTextOutW(hdc, x, y, (flags & DT_NOCLIP) ? 0 : ETO_CLIPPED, if (!ExtTextOutW( hdc, x, y,
rect, line, len, NULL )) return 0; ( (flags & DT_NOCLIP) ? 0 : ETO_CLIPPED ) | ( (flags & DT_RTLREADING) ? 0 : ETO_RTLREADING ),
rect, line, len, NULL )) return 0;
if (prefix_offset != -1) if (prefix_offset != -1)
{ {
HPEN hpen = CreatePen( PS_SOLID, 1, GetTextColor(hdc) ); HPEN hpen = CreatePen( PS_SOLID, 1, GetTextColor(hdc) );
@ -410,20 +418,26 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT i_count,
break; break;
} }
} }
if (dtp)
dtp->uiLengthDrawn += len;
} }
while (strPtr); while (strPtr);
if (flags & DT_CALCRECT) if (flags & DT_CALCRECT)
{ {
rect->right = rect->left + max_width; rect->right = rect->left + max_width;
rect->bottom = y; rect->bottom = y;
if (dtp)
rect->right += lmargin + rmargin;
} }
return y - rect->top; return y - rect->top;
} }
/*********************************************************************** /***********************************************************************
* DrawTextA (USER32.@) * DrawTextExA (USER32.@)
*/ */
INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count,
LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
{ {
WCHAR *wstr; WCHAR *wstr;
INT ret = 0; INT ret = 0;
@ -437,6 +451,8 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags )
{ {
MultiByteToWideChar( CP_ACP, 0, str, count, wstr, wcount ); MultiByteToWideChar( CP_ACP, 0, str, count, wstr, wcount );
ret = DrawTextExW( hdc, wstr, wcount, rect, flags, NULL ); ret = DrawTextExW( hdc, wstr, wcount, rect, flags, NULL );
if (flags & DT_MODIFYSTRING)
WideCharToMultiByte( CP_ACP, 0, wstr, -1, str, count, NULL, NULL );
HeapFree(GetProcessHeap(), 0, wstr); HeapFree(GetProcessHeap(), 0, wstr);
} }
return ret; return ret;
@ -445,24 +461,17 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags )
/*********************************************************************** /***********************************************************************
* DrawTextW (USER32.@) * DrawTextW (USER32.@)
*/ */
INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags )
LPRECT rect, UINT flags )
{ {
return DrawTextExW(hdc, str, count, rect, flags, NULL); return DrawTextExW(hdc, (LPWSTR)str, count, rect, flags, NULL);
} }
/*********************************************************************** /***********************************************************************
* DrawTextExA (USER32.@) * DrawTextA (USER32.@)
*/ */
INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count, INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags )
LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
{ {
TRACE("(%d,%s,%d,%p,0x%08x,%p)\n",hdc,debugstr_an(str,count),count,rect,flags,dtp); return DrawTextExA( hdc, (LPSTR)str, count, rect, flags, NULL );
if(dtp) {
FIXME("Ignores params:%d,%d,%d,%d\n",dtp->cbSize,
dtp->iTabLength,dtp->iLeftMargin,dtp->iRightMargin);
}
return DrawTextA(hdc,str,count,rect,flags);
} }
/*********************************************************************** /***********************************************************************

46
include/winuser.h
View file

@ -3499,30 +3499,32 @@ BOOL WINAPI DrawCaption(HWND,HDC,const RECT*,UINT);
BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT); BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
BOOL WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT); BOOL WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT);
#define DrawCaptionTemp WINELIB_NAME_AW(DrawCaptionTemp) #define DrawCaptionTemp WINELIB_NAME_AW(DrawCaptionTemp)
BOOL WINAPI DrawEdge(HDC,LPRECT,UINT,UINT); BOOL WINAPI DrawEdge(HDC,LPRECT,UINT,UINT);
BOOL WINAPI DrawFocusRect(HDC,const RECT*); BOOL WINAPI DrawFocusRect(HDC,const RECT*);
BOOL WINAPI DrawFrameControl(HDC,LPRECT,UINT,UINT); BOOL WINAPI DrawFrameControl(HDC,LPRECT,UINT,UINT);
BOOL WINAPI DrawIcon(HDC,INT,INT,HICON); BOOL WINAPI DrawIcon(HDC,INT,INT,HICON);
BOOL WINAPI DrawIconEx(HDC,INT,INT,HICON,INT,INT, BOOL WINAPI DrawIconEx(HDC,INT,INT,HICON,INT,INT,UINT,HBRUSH,UINT);
UINT,HBRUSH,UINT); BOOL WINAPI DrawMenuBar(HWND);
BOOL WINAPI DrawMenuBar(HWND); BOOL WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
BOOL WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT); BOOL WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
BOOL WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
#define DrawState WINELIB_NAME_AW(DrawState) #define DrawState WINELIB_NAME_AW(DrawState)
INT WINAPI DrawTextA(HDC,LPCSTR,INT,LPRECT,UINT); INT WINAPI DrawTextA(HDC,LPCSTR,INT,LPRECT,UINT);
INT WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT); INT WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT);
#define DrawText WINELIB_NAME_AW(DrawText) #define DrawText WINELIB_NAME_AW(DrawText)
BOOL WINAPI EmptyClipboard(void); INT WINAPI DrawTextExA(HDC,LPSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
UINT WINAPI EnableMenuItem(HMENU,UINT,UINT); INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
BOOL WINAPI EnableScrollBar(HWND,INT,UINT); #define DrawTextEx WINELIB_NAME_AW(DrawTextEx)
BOOL WINAPI EnableWindow(HWND,BOOL); BOOL WINAPI EmptyClipboard(void);
BOOL WINAPI EndDeferWindowPos(HDWP); UINT WINAPI EnableMenuItem(HMENU,UINT,UINT);
BOOL WINAPI EndDialog(HWND,INT); BOOL WINAPI EnableScrollBar(HWND,INT,UINT);
BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*); BOOL WINAPI EnableWindow(HWND,BOOL);
BOOL WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM); BOOL WINAPI EndDeferWindowPos(HDWP);
UINT WINAPI EnumClipboardFormats(UINT); BOOL WINAPI EndDialog(HWND,INT);
INT WINAPI EnumPropsA(HWND,PROPENUMPROCA); BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
INT WINAPI EnumPropsW(HWND,PROPENUMPROCW); BOOL WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
UINT WINAPI EnumClipboardFormats(UINT);
INT WINAPI EnumPropsA(HWND,PROPENUMPROCA);
INT WINAPI EnumPropsW(HWND,PROPENUMPROCW);
#define EnumProps WINELIB_NAME_AW(EnumProps) #define EnumProps WINELIB_NAME_AW(EnumProps)
BOOL WINAPI EnumWindows(WNDENUMPROC,LPARAM); BOOL WINAPI EnumWindows(WNDENUMPROC,LPARAM);
BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM); BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM);