ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32][COMCTL32] Edit: Optimize EDIT_SetCaretPos for speed (#8113)

Browse Source 
The caret move on IME was slow until this PR.
JIRA issue: CORE-19268
- Don't use ImmIsIME but use IS_IME_HKL(hKL) in
  EDIT_SetCaretPos function. This change improves
  the caret speed.
- Prohibit display of composition window for Korean
  in the handling of WM_IME_SETCONTEXT and
  WM_IME_STARTCOMPOSITION, because Korean
  doesn't want it.
This commit is contained in:
Katayama Hirofumi MZ
2025-06-14 20:26:05 +09:00
committed by GitHub
parent d0ca0f41f7
commit 62ad2403a0
2 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/comctl32/edit.c
+33 -24
View File
@@ -1762,10 +1762,8 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos,
SetCaretPos(pt.x, pt.y);
if (!ImmIsIME(hKL))
return;
EDIT_ImmSetCompositionWindow(es, pt);
if (IS_IME_HKL(hKL))
EDIT_ImmSetCompositionWindow(es, pt);
#else
TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res));
SetCaretPos((short)LOWORD(res), (short)HIWORD(res));
@@ -3884,7 +3882,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw)
ShowCaret(es->hwndSelf);
}
#ifdef __REACTOS__
if (ImmIsIME(GetKeyboardLayout(0)))
if (IS_IME_HKL(GetKeyboardLayout(0)))
{
LOGFONTW lf;
HIMC hIMC = ImmGetContext(es->hwndSelf);
@@ -5181,32 +5179,43 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
/* IME messages to make the edit control IME aware */
case WM_IME_SETCONTEXT:
#ifdef __REACTOS__
if (FALSE) /* FIXME: Condition */
lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
if (wParam)
{
HIMC hIMC = ImmGetContext(hwnd);
LPINPUTCONTEXTDX pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC);
if (pIC)
{
pIC->dwUIFlags &= ~0x40000;
ImmUnlockIMC(hIMC);
}
if (FALSE) /* FIXME: Condition */
ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
ImmReleaseContext(hwnd, hIMC);
}
HKL hKL = GetKeyboardLayout(0);
result = DefWindowProcW(hwnd, msg, wParam, lParam);
/* Korean doesn't want composition window */
if (PRIMARYLANGID(LOWORD(hKL)) == LANG_KOREAN)
lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
if (wParam)
{
HIMC hIMC = ImmGetContext(hwnd);
LPINPUTCONTEXTDX pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC);
if (pIC)
{
pIC->dwUIFlags &= ~0x40000;
ImmUnlockIMC(hIMC);
}
if (FALSE) /* FIXME: Condition */
ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
ImmReleaseContext(hwnd, hIMC);
}
result = DefWindowProcW(hwnd, msg, wParam, lParam);
}
#endif
break;
case WM_IME_STARTCOMPOSITION:
#ifdef __REACTOS__
if (FALSE) /* FIXME: Condition */
return TRUE;
result = DefWindowProcW(hwnd, msg, wParam, lParam);
{
HKL hKL = GetKeyboardLayout(0);
/* Korean doesn't want composition window */
if (PRIMARYLANGID(LOWORD(hKL)) == LANG_KOREAN)
return TRUE;
result = DefWindowProcW(hwnd, msg, wParam, lParam);
}
#else
es->composition_start = es->selection_end;
es->composition_len = 0;
win32ss/user/user32/controls/edit.c
+33 -24
View File
@@ -1914,10 +1914,8 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos,
SetCaretPos(pt.x, pt.y);
if (!ImmIsIME(hKL))
return;
EDIT_ImmSetCompositionWindow(es, pt);
if (IS_IME_HKL(hKL))
EDIT_ImmSetCompositionWindow(es, pt);
#else
TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res));
SetCaretPos((short)LOWORD(res), (short)HIWORD(res));
@@ -4038,7 +4036,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw)
ShowCaret(es->hwndSelf);
}
#ifdef __REACTOS__
if (ImmIsIME(GetKeyboardLayout(0)))
if (IS_IME_HKL(GetKeyboardLayout(0)))
{
LOGFONTW lf;
HIMC hIMC = ImmGetContext(es->hwndSelf);
@@ -5387,32 +5385,43 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
/* IME messages to make the edit control IME aware */
case WM_IME_SETCONTEXT:
#ifdef __REACTOS__
if (FALSE) /* FIXME: Condition */
lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
if (wParam)
{
HIMC hIMC = ImmGetContext(hwnd);
LPINPUTCONTEXTDX pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC);
if (pIC)
{
pIC->dwUIFlags &= ~0x40000;
ImmUnlockIMC(hIMC);
}
if (GetWin32ClientInfo()->CI_flags & CI_WOW)
ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
ImmReleaseContext(hwnd, hIMC);
}
HKL hKL = GetKeyboardLayout(0);
result = DefWindowProcT(hwnd, WM_IME_SETCONTEXT, wParam, lParam, unicode);
/* Korean doesn't want composition window */
if (PRIMARYLANGID(LOWORD(hKL)) == LANG_KOREAN)
lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
if (wParam)
{
HIMC hIMC = ImmGetContext(hwnd);
LPINPUTCONTEXTDX pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC);
if (pIC)
{
pIC->dwUIFlags &= ~0x40000;
ImmUnlockIMC(hIMC);
}
if (GetWin32ClientInfo()->CI_flags & CI_WOW)
ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
ImmReleaseContext(hwnd, hIMC);
}
result = DefWindowProcT(hwnd, WM_IME_SETCONTEXT, wParam, lParam, unicode);
}
#endif
break;
case WM_IME_STARTCOMPOSITION:
#ifdef __REACTOS__
if (FALSE) /* FIXME: Condition */
return TRUE;
result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode);
{
HKL hKL = GetKeyboardLayout(0);
/* Korean doesn't want composition window */
if (PRIMARYLANGID(LOWORD(hKL)) == LANG_KOREAN)
return TRUE;
result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode);
}
#else
es->composition_start = es->selection_end;
es->composition_len = 0;