Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-29 03:32:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[User32] - Edit, Sync to Wine 1.3.37.

Browse source 
svn path=/trunk/; revision=55202
This commit is contained in:
James Tabor 2012-01-26 15:09:49 +00:00
parent c8c27cf35b
commit 8ac4dcd6dd
1 changed files with 56 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

71
reactos/dll/win32/user32/controls/edit.c
View file

@ -1058,13 +1058,15 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
while (line_def->index != li) while (line_def->index != li)
line_def = line_def->next; line_def = line_def->next;
if (!line_def->ssa)
return 0;
lw = line_def->width; lw = line_def->width;
w = es->format_rect.right - es->format_rect.left; w = es->format_rect.right - es->format_rect.left;
ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); if (line_def->ssa)
x -= es->x_offset; {
ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x);
x -= es->x_offset;
}
else
x = es->x_offset;
if (es->style & ES_RIGHT) if (es->style & ES_RIGHT)
x = w - (lw - x); x = w - (lw - x);
@ -1080,6 +1082,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
{ {
if (es->x_offset >= get_text_length(es)) if (es->x_offset >= get_text_length(es))
{ {
int leftover = es->x_offset - get_text_length(es);
if (es->ssa) if (es->ssa)
{ {
const SIZE *size; const SIZE *size;
@ -1088,8 +1091,10 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
} }
else else
xoff = 0; xoff = 0;
xoff += es->char_width * leftover;
} }
ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); else
ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff);
} }
else else
xoff = 0; xoff = 0;
@ -1109,8 +1114,8 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
} }
else if (es->ssa) else if (es->ssa)
ScriptStringCPtoX(es->ssa, index, FALSE, &xi); ScriptStringCPtoX(es->ssa, index, FALSE, &xi);
else else
xi = 0; xi = 0;
} }
x = xi - xoff; x = xi - xoff;
@ -1145,18 +1150,52 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
*/ */
static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc) static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc)
{ {
INT line_index = EDIT_EM_LineIndex(es, line); SCRIPT_STRING_ANALYSIS ssa;
INT pt1, pt2; INT line_index = 0;
INT pt1, pt2, pt3;
if (es->style & ES_MULTILINE) if (es->style & ES_MULTILINE)
{
const LINEDEF *line_def = NULL;
rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height; rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height;
if (line >= es->line_count)
return;
line_def = es->first_line_def;
if (line == -1) {
INT index = es->selection_end - line_def->length;
while ((index >= 0) && line_def->next) {
line_index += line_def->length;
line_def = line_def->next;
index -= line_def->length;
}
} else {
while (line > 0) {
line_index += line_def->length;
line_def = line_def->next;
line--;
}
}
ssa = line_def->ssa;
}
else else
{
line_index = 0;
rc->top = es->format_rect.top; rc->top = es->format_rect.top;
ssa = es->ssa;
}
rc->bottom = rc->top + es->line_height; rc->bottom = rc->top + es->line_height;
pt1 = (scol == 0) ? es->format_rect.left : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + scol, TRUE)); pt1 = (scol == 0) ? es->format_rect.left : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + scol, TRUE));
pt2 = (ecol == -1) ? es->format_rect.right : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE)); pt2 = (ecol == -1) ? es->format_rect.right : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE));
rc->right = max(pt1 , pt2); if (ssa)
rc->left = min(pt1, pt2); {
ScriptStringCPtoX(ssa, scol, FALSE, &pt3);
pt3+=es->format_rect.left;
}
else pt3 = pt1;
rc->right = max(max(pt1 , pt2),pt3);
rc->left = min(min(pt1, pt2),pt3);
} }
@ -3666,7 +3705,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
(es->style & ES_NOHIDESEL)); (es->style & ES_NOHIDESEL));
dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps);
/* The dc we use for calcualting may not be the one we paint into. /* The dc we use for calculating may not be the one we paint into.
This is the safest action. */ This is the safest action. */
EDIT_InvalidateUniscribeData(es); EDIT_InvalidateUniscribeData(es);
GetClientRect(es->hwndSelf, &rcClient); GetClientRect(es->hwndSelf, &rcClient);
@ -3719,11 +3758,13 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
if (es->style & ES_MULTILINE) { if (es->style & ES_MULTILINE) {
INT vlc = get_vertical_line_count(es); INT vlc = get_vertical_line_count(es);
for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) { for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) {
EDIT_UpdateUniscribeData(es, dc, i);
EDIT_GetLineRect(es, i, 0, -1, &rcLine); EDIT_GetLineRect(es, i, 0, -1, &rcLine);
if (IntersectRect(&rc, &rcRgn, &rcLine)) if (IntersectRect(&rc, &rcRgn, &rcLine))
EDIT_PaintLine(es, dc, i, rev); EDIT_PaintLine(es, dc, i, rev);
} }
} else { } else {
EDIT_UpdateUniscribeData(es, dc, 0);
EDIT_GetLineRect(es, 0, 0, -1, &rcLine); EDIT_GetLineRect(es, 0, 0, -1, &rcLine);
if (IntersectRect(&rc, &rcRgn, &rcLine)) if (IntersectRect(&rc, &rcRgn, &rcLine))
EDIT_PaintLine(es, dc, 0, rev); EDIT_PaintLine(es, dc, 0, rev);