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 891316 part.6 Use widget::MSGResult in nsIMEHandler r=jimm

Browse Source
This commit is contained in:
Masayuki Nakano 2013-07-18 17:12:31 +09:00
parent cc2e05c46a
commit 6c52af3e38
3 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/windows/WinIMEHandler.cpp
View File

@ -114,7 +114,7 @@ IMEHandler::ProcessMessage(nsWindow* aWindow, UINT aMessage,
#endif // #ifdef NS_ENABLE_TSF
return nsIMM32Handler::ProcessMessage(aWindow, aMessage, aWParam, aLParam,
&aResult.mResult, aResult.mConsumed);
aResult);
}
// static

97
widget/windows/nsIMM32Handler.cpp
View File

@ -11,6 +11,7 @@
#include "nsIMM32Handler.h"
#include "nsWindow.h"
#include "nsWindowDefs.h"
#include "WinUtils.h"
#include "KeyboardLayout.h"
#include <algorithm>
@ -239,14 +240,14 @@ nsIMM32Handler::CancelComposition(nsWindow* aWindow, bool aForce)
nsIMM32Handler::ProcessInputLangChangeMessage(nsWindow* aWindow,
WPARAM wParam,
LPARAM lParam,
LRESULT *aRetValue,
bool &aEatMessage)
MSGResult& aResult)
{
*aRetValue = 0;
aEatMessage = false;
aResult.mResult = 0;
aResult.mConsumed = false;
// We don't need to create the instance of the handler here.
if (gIMM32Handler) {
aEatMessage = gIMM32Handler->OnInputLangChange(aWindow, wParam, lParam);
aResult.mConsumed =
gIMM32Handler->OnInputLangChange(aWindow, wParam, lParam);
}
InitKeyboardLayout(reinterpret_cast<HKL>(lParam));
// We can release the instance here, because the instance may be never
@ -260,7 +261,7 @@ nsIMM32Handler::ProcessInputLangChangeMessage(nsWindow* aWindow,
/* static */ bool
nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
WPARAM &wParam, LPARAM &lParam,
LRESULT *aRetValue, bool &aEatMessage)
MSGResult& aResult)
{
// XXX We store the composing window in mComposingWindow. If IME messages are
// sent to different window, we should commit the old transaction. And also
@ -270,70 +271,67 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
// When a plug-in has focus or compsition, we should dispatch the IME events
// to the plug-in.
if (aWindow->PluginHasFocus() || IsComposingOnPlugin()) {
return ProcessMessageForPlugin(aWindow, msg, wParam, lParam, aRetValue,
aEatMessage);
return ProcessMessageForPlugin(aWindow, msg, wParam, lParam, aResult);
}
*aRetValue = 0;
aResult.mResult = 0;
switch (msg) {
case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: {
// We don't need to create the instance of the handler here.
if (!gIMM32Handler)
return false;
if (!gIMM32Handler->OnMouseEvent(aWindow, lParam,
msg == WM_LBUTTONDOWN ? IMEMOUSE_LDOWN :
msg == WM_MBUTTONDOWN ? IMEMOUSE_MDOWN :
IMEMOUSE_RDOWN)) {
if (!gIMM32Handler) {
return false;
}
aEatMessage = false;
return true;
return gIMM32Handler->OnMouseEvent(aWindow, lParam,
msg == WM_LBUTTONDOWN ? IMEMOUSE_LDOWN :
msg == WM_MBUTTONDOWN ? IMEMOUSE_MDOWN :
IMEMOUSE_RDOWN, aResult);
}
case WM_INPUTLANGCHANGE:
return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
aRetValue, aEatMessage);
return ProcessInputLangChangeMessage(aWindow, wParam, lParam, aResult);
case WM_IME_STARTCOMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEStartComposition(aWindow);
aResult.mConsumed = gIMM32Handler->OnIMEStartComposition(aWindow);
return true;
case WM_IME_COMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEComposition(aWindow, wParam, lParam);
aResult.mConsumed =
gIMM32Handler->OnIMEComposition(aWindow, wParam, lParam);
return true;
case WM_IME_ENDCOMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEEndComposition(aWindow);
aResult.mConsumed = gIMM32Handler->OnIMEEndComposition(aWindow);
return true;
case WM_IME_CHAR:
aEatMessage = OnIMEChar(aWindow, wParam, lParam);
aResult.mConsumed = OnIMEChar(aWindow, wParam, lParam);
return true;
case WM_IME_NOTIFY:
aEatMessage = OnIMENotify(aWindow, wParam, lParam);
aResult.mConsumed = OnIMENotify(aWindow, wParam, lParam);
return true;
case WM_IME_REQUEST:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMERequest(aWindow, wParam, lParam, aRetValue);
aResult.mConsumed =
gIMM32Handler->OnIMERequest(aWindow, wParam, lParam, &aResult.mResult);
return true;
case WM_IME_SELECT:
aEatMessage = OnIMESelect(aWindow, wParam, lParam);
aResult.mConsumed = OnIMESelect(aWindow, wParam, lParam);
return true;
case WM_IME_SETCONTEXT:
aEatMessage = OnIMESetContext(aWindow, wParam, lParam, aRetValue);
aResult.mConsumed =
OnIMESetContext(aWindow, wParam, lParam, &aResult.mResult);
return true;
case WM_KEYDOWN:
return OnKeyDownEvent(aWindow, wParam, lParam, aEatMessage);
return OnKeyDownEvent(aWindow, wParam, lParam, aResult);
case WM_CHAR:
if (!gIMM32Handler) {
return false;
}
aEatMessage = gIMM32Handler->OnChar(aWindow, wParam, lParam);
// If we eat this message, we should return "processed", otherwise,
aResult.mConsumed = gIMM32Handler->OnChar(aWindow, wParam, lParam);
// If we consume this message, we should return "processed", otherwise,
// the message should be handled on nsWindow, so, we should return
// "not processed" at that time.
return aEatMessage;
return aResult.mConsumed;
default:
return false;
};
@ -342,45 +340,44 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
/* static */ bool
nsIMM32Handler::ProcessMessageForPlugin(nsWindow* aWindow, UINT msg,
WPARAM &wParam, LPARAM &lParam,
LRESULT *aRetValue,
bool &aEatMessage)
MSGResult& aResult)
{
*aRetValue = 0;
aEatMessage = false;
aResult.mResult = 0;
aResult.mConsumed = false;
switch (msg) {
case WM_INPUTLANGCHANGEREQUEST:
case WM_INPUTLANGCHANGE:
aWindow->DispatchPluginEvent(msg, wParam, lParam, false);
return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
aRetValue, aEatMessage);
return ProcessInputLangChangeMessage(aWindow, wParam, lParam, aResult);
case WM_IME_COMPOSITION:
EnsureHandlerInstance();
aEatMessage =
aResult.mConsumed =
gIMM32Handler->OnIMECompositionOnPlugin(aWindow, wParam, lParam);
return true;
case WM_IME_STARTCOMPOSITION:
EnsureHandlerInstance();
aEatMessage =
aResult.mConsumed =
gIMM32Handler->OnIMEStartCompositionOnPlugin(aWindow, wParam, lParam);
return true;
case WM_IME_ENDCOMPOSITION:
EnsureHandlerInstance();
aEatMessage =
aResult.mConsumed =
gIMM32Handler->OnIMEEndCompositionOnPlugin(aWindow, wParam, lParam);
return true;
case WM_IME_CHAR:
EnsureHandlerInstance();
aEatMessage =
aResult.mConsumed =
gIMM32Handler->OnIMECharOnPlugin(aWindow, wParam, lParam);
return true;
case WM_IME_SETCONTEXT:
aEatMessage = OnIMESetContextOnPlugin(aWindow, wParam, lParam, aRetValue);
aResult.mConsumed =
OnIMESetContextOnPlugin(aWindow, wParam, lParam, &aResult.mResult);
return true;
case WM_CHAR:
if (!gIMM32Handler) {
return false;
}
aEatMessage =
aResult.mConsumed =
gIMM32Handler->OnCharOnPlugin(aWindow, wParam, lParam);
return false; // is going to be handled by nsWindow.
case WM_IME_COMPOSITIONFULL:
@ -389,7 +386,8 @@ nsIMM32Handler::ProcessMessageForPlugin(nsWindow* aWindow, UINT msg,
case WM_IME_KEYUP:
case WM_IME_REQUEST:
case WM_IME_SELECT:
aEatMessage = aWindow->DispatchPluginEvent(msg, wParam, lParam, false);
aResult.mConsumed =
aWindow->DispatchPluginEvent(msg, wParam, lParam, false);
return true;
}
return false;
@ -1937,8 +1935,11 @@ nsIMM32Handler::ResolveIMECaretPos(nsIWidget* aReferenceWidget,
}
bool
nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction,
MSGResult& aResult)
{
aResult.mConsumed = false; // always call next wndprc
if (!sWM_MSIME_MOUSE || !mIsComposing ||
!ShouldDrawCompositionStringOurselves()) {
return false;
@ -1996,12 +1997,12 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
/* static */ bool
nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
bool &aEatMessage)
MSGResult& aResult)
{
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnKeyDownEvent, hWnd=%08x, wParam=%08x, lParam=%08x\n",
aWindow->GetWindowHandle(), wParam, lParam));
aEatMessage = false;
aResult.mConsumed = false;
switch (wParam) {
case VK_TAB:
case VK_PRIOR:

32
widget/windows/nsIMM32Handler.h
View File

@ -16,6 +16,14 @@ class nsIWidget;
class nsWindow;
struct nsIntRect;
namespace mozilla {
namespace widget {
struct MSGResult;
} // namespace widget
} // namespace mozilla
class nsIMEContext
{
public:
@ -101,18 +109,15 @@ protected:
class nsIMM32Handler
{
typedef mozilla::widget::MSGResult MSGResult;
public:
static void Initialize();
static void Terminate();
// The result of Process* method mean "The message was processed, don't
// process the message in the caller (nsWindow)" when it's TRUE. At that
// time, aEatMessage means that the message should be passed to next WndProc
// when it's FALSE, otherwise, the message should be eaten by us. When the
// result is FALSE, aEatMessage doesn't have any meaning. Then, the caller
// should continue to process the message.
// If Process*() returns true, the caller shouldn't do anything anymore.
static bool ProcessMessage(nsWindow* aWindow, UINT msg,
WPARAM &wParam, LPARAM &lParam,
LRESULT *aRetValue, bool &aEatMessage);
WPARAM& wParam, LPARAM& lParam,
MSGResult& aResult);
static bool IsComposing()
{
return IsComposingOnOurEditor() || IsComposingOnPlugin();
@ -157,21 +162,20 @@ protected:
static bool ProcessInputLangChangeMessage(nsWindow* aWindow,
WPARAM wParam,
LPARAM lParam,
LRESULT *aRetValue,
bool &aEatMessage);
MSGResult& aResult);
static bool ProcessMessageForPlugin(nsWindow* aWindow, UINT msg,
WPARAM &wParam, LPARAM &lParam,
LRESULT *aRetValue,
bool &aEatMessage);
MSGResult& aResult);
nsIMM32Handler();
~nsIMM32Handler();
// The result of following On*Event methods means "The message was processed,
// don't process the message in the caller (nsWindow)".
bool OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction);
bool OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction,
MSGResult& aResult);
static bool OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
bool &aEatMessage);
MSGResult& aResult);
// The result of On* methods mean "eat this message" when it's TRUE.
bool OnIMEStartComposition(nsWindow* aWindow);