wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1081993 WinIMEHandler should notify nsIMM32Handler of some notifications even in TSF mode when IMM IME is active r=emk

Browse Source
This commit is contained in:
Masayuki Nakano 2014-10-16 10:02:29 +09:00
parent e68c05fb4f
commit cf79bd9cd3
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
widget/windows/WinIMEHandler.cpp
View File

@ -129,13 +129,22 @@ IMEHandler::ProcessMessage(nsWindow* aWindow, UINT aMessage,
aResult);
}
#ifdef NS_ENABLE_TSF
// static
bool
IMEHandler::IsIMMActive()
{
return nsTextStore::IsIMM_IME();
}
#endif // #ifdef NS_ENABLE_TSF
// static
bool
IMEHandler::IsComposing()
{
#ifdef NS_ENABLE_TSF
if (IsTSFAvailable()) {
return nsTextStore::IsComposing();
return nsTextStore::IsComposing() || nsIMM32Handler::IsComposing();
}
#endif // #ifdef NS_ENABLE_TSF
@ -148,7 +157,8 @@ IMEHandler::IsComposingOn(nsWindow* aWindow)
{
#ifdef NS_ENABLE_TSF
if (IsTSFAvailable()) {
return nsTextStore::IsComposingOn(aWindow);
return nsTextStore::IsComposingOn(aWindow) ||
nsIMM32Handler::IsComposingOn(aWindow);
}
#endif // #ifdef NS_ENABLE_TSF
@ -163,8 +173,24 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
#ifdef NS_ENABLE_TSF
if (IsTSFAvailable()) {
switch (aIMENotification.mMessage) {
case NOTIFY_IME_OF_SELECTION_CHANGE:
return nsTextStore::OnSelectionChange();
case NOTIFY_IME_OF_SELECTION_CHANGE: {
nsresult rv = nsTextStore::OnSelectionChange();
// If IMM IME is active, we need to notify nsIMM32Handler of updating
// composition change. It will adjust candidate window position or
// composition window position.
if (IsIMMActive()) {
nsIMM32Handler::OnUpdateComposition(aWindow);
}
return rv;
}
case NOTIFY_IME_OF_COMPOSITION_UPDATE:
// If IMM IME is active, we need to notify nsIMM32Handler of updating
// composition change. It will adjust candidate window position or
// composition window position.
if (IsIMMActive()) {
nsIMM32Handler::OnUpdateComposition(aWindow);
}
return NS_OK;
case NOTIFY_IME_OF_TEXT_CHANGE:
return nsTextStore::OnTextChange(aIMENotification);
case NOTIFY_IME_OF_FOCUS:
@ -174,15 +200,23 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
return nsTextStore::OnFocusChange(false, aWindow,
aWindow->GetInputContext());
case NOTIFY_IME_OF_MOUSE_BUTTON_EVENT:
// If IMM IME is active, we should send a mouse button event via IMM.
if (IsIMMActive()) {
return nsIMM32Handler::OnMouseButtonEvent(aWindow, aIMENotification);
}
return nsTextStore::OnMouseButtonEvent(aIMENotification);
case REQUEST_TO_COMMIT_COMPOSITION:
if (nsTextStore::IsComposingOn(aWindow)) {
nsTextStore::CommitComposition(false);
} else if (IsIMMActive()) {
nsIMM32Handler::CommitComposition(aWindow);
}
return NS_OK;
case REQUEST_TO_CANCEL_COMPOSITION:
if (nsTextStore::IsComposingOn(aWindow)) {
nsTextStore::CommitComposition(true);
} else if (IsIMMActive()) {
nsIMM32Handler::CancelComposition(aWindow);
}
return NS_OK;
case NOTIFY_IME_OF_POSITION_CHANGE:
@ -239,7 +273,7 @@ bool
IMEHandler::GetOpenState(nsWindow* aWindow)
{
#ifdef NS_ENABLE_TSF
if (IsTSFAvailable()) {
if (IsTSFAvailable() && !IsIMMActive()) {
return nsTextStore::GetIMEOpenState();
}
#endif //NS_ENABLE_TSF

1
widget/windows/WinIMEHandler.h
View File

@ -122,6 +122,7 @@ private:
static bool sPluginHasFocus;
static bool IsTSFAvailable() { return (sIsInTSFMode && !sPluginHasFocus); }
static bool IsIMMActive();
#endif // #ifdef NS_ENABLE_TSF
};