Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTUSER] Send WM_IME_SYSTEM:IMS_UPDATEIMEUI (#5075)

Browse source 
Send WM_IME_SYSTEM:IMS_UPDATEIMEUI message after window position change to improve IME UI sync. CORE-11700, CORE-15289
This commit is contained in:
Katayama Hirofumi MZ 2023-02-22 08:35:55 +09:00 committed by GitHub
parent ead9366ef7
commit 95a64cbdd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
win32ss/user/ntuser/winpos.c
View file

@ -4,9 +4,11 @@
* PURPOSE: Windows * PURPOSE: Windows
* FILE: win32ss/user/ntuser/winpos.c * FILE: win32ss/user/ntuser/winpos.c
* PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
* Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
#include <win32k.h> #include <win32k.h>
#include <ddk/immdev.h>
DBG_DEFAULT_CHANNEL(UserWinpos); DBG_DEFAULT_CHANNEL(UserWinpos);
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
@ -1743,6 +1745,43 @@ ForceNCPaintErase(PWND Wnd, HRGN hRgn, PREGION pRgn)
} }
} }
static VOID FASTCALL IntImeWindowPosChanged(VOID)
{
HWND *phwnd;
PWND pwndNode, pwndDesktop = UserGetDesktopWindow();
PWINDOWLIST pWL;
USER_REFERENCE_ENTRY Ref;
if (!pwndDesktop)
return;
/* Enumerate the windows to get the IME windows (of default and non-default) */
pWL = IntBuildHwndList(pwndDesktop->spwndChild, IACE_LIST, gptiCurrent);
if (!pWL)
return;
for (phwnd = pWL->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd)
{
if (gptiCurrent->TIF_flags & TIF_INCLEANUP)
break;
pwndNode = ValidateHwndNoErr(*phwnd);
if (pwndNode == NULL ||
pwndNode->head.pti != gptiCurrent ||
pwndNode->pcls->atomClassName != gpsi->atomSysClass[ICLS_IME])
{
continue;
}
/* Now hwndNode is an IME window of the current thread */
UserRefObjectCo(pwndNode, &Ref);
co_IntSendMessage(*phwnd, WM_IME_SYSTEM, IMS_UPDATEIMEUI, 0);
UserDerefObjectCo(pwndNode);
}
IntFreeHwndList(pWL);
}
/* x and y are always screen relative */ /* x and y are always screen relative */
BOOLEAN FASTCALL BOOLEAN FASTCALL
co_WinPosSetWindowPos( co_WinPosSetWindowPos(
@ -2303,6 +2342,13 @@ co_WinPosSetWindowPos(
IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI);
} }
/* Send WM_IME_SYSTEM:IMS_UPDATEIMEUI to the IME windows if necessary */
if ((WinPos.flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE))
{
if (IS_IMM_MODE())
IntImeWindowPosChanged();
}
if(bPointerInWindow != IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y)) if(bPointerInWindow != IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y))
{ {
/* Generate mouse move message */ /* Generate mouse move message */
@ -3165,6 +3211,7 @@ BOOL FASTCALL IntEndDeferWindowPosEx(HDWP hdwp, BOOL bAsync)
UserDerefObjectCo(pwnd); UserDerefObjectCo(pwnd);
} }
ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP); ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP);
UserDereferenceObject(pDWP); UserDereferenceObject(pDWP);
UserDeleteObject(hdwp, TYPE_SETWINDOWPOS); UserDeleteObject(hdwp, TYPE_SETWINDOWPOS);