Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 855975 part.21 Rename nsFakeCharMessage with widget::NativeKey::FakeCharMsg r=jimm

Browse Source
This commit is contained in:
Masayuki Nakano 2013-05-29 15:34:49 +09:00
parent a077030500
commit 04f15faf88
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widget/windows/KeyboardLayout.cpp
View File

@ -389,7 +389,7 @@ VirtualKey::FillKbdState(PBYTE aKbdState,
NativeKey::NativeKey(nsWindowBase* aWidget,
const MSG& aKeyOrCharMessage,
const ModifierKeyState& aModKeyState,
const nsFakeCharMessage* aFakeCharMessage) :
const FakeCharMsg* aFakeCharMsg) :
mWidget(aWidget), mMsg(aKeyOrCharMessage), mDOMKeyCode(0),
mModKeyState(aModKeyState), mVirtualKeyCode(0), mOriginalVirtualKeyCode(0),
mIsFakeCharMsg(false)
@ -408,8 +408,8 @@ NativeKey::NativeKey(nsWindowBase* aWidget,
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
// Store following WM_*CHAR message into mCharMsg.
if (aFakeCharMessage) {
mCharMsg = aFakeCharMessage->GetCharMessage(mMsg.hwnd);
if (aFakeCharMsg) {
mCharMsg = aFakeCharMsg->GetCharMsg(mMsg.hwnd);
mIsFakeCharMsg = true;
} else {
MSG msg;
@ -2183,10 +2183,10 @@ KeyboardLayout::SynthesizeNativeKeyEvent(nsWindowBase* aWidget,
MSG keyDownMsg = WinUtils::InitMSG(WM_KEYDOWN, key, lParam,
aWidget->GetWindowHandle());
if (i == keySequence.Length() - 1) {
bool makeDeadCharMessage =
bool makeDeadCharMsg =
(IsDeadKey(key, modKeyState) && aCharacters.IsEmpty());
nsAutoString chars(aCharacters);
if (makeDeadCharMessage) {
if (makeDeadCharMsg) {
UniCharsAndModifiers deadChars =
GetUniCharsAndModifiers(key, modKeyState);
chars = deadChars.ToString();
@ -2197,15 +2197,15 @@ KeyboardLayout::SynthesizeNativeKeyEvent(nsWindowBase* aWidget,
NativeKey nativeKey(aWidget, keyDownMsg, modKeyState);
nativeKey.HandleKeyDownMessage();
} else {
nsFakeCharMessage fakeMsgForKeyDown = { chars.CharAt(0), scanCode,
makeDeadCharMessage };
NativeKey nativeKey(aWidget, keyDownMsg, modKeyState, &fakeMsgForKeyDown);
NativeKey::FakeCharMsg fakeMsgForKeyDown = { chars.CharAt(0), scanCode,
makeDeadCharMsg };
NativeKey nativeKey(aWidget, keyDownMsg, modKeyState,
&fakeMsgForKeyDown);
nativeKey.HandleKeyDownMessage();
for (uint32_t j = 1; j < chars.Length(); j++) {
nsFakeCharMessage fakeMsgForChar = { chars.CharAt(j), scanCode,
false };
MSG charMsg =
fakeMsgForChar.GetCharMessage(aWidget->GetWindowHandle());
NativeKey::FakeCharMsg fakeMsgForChar = { chars.CharAt(j), scanCode,
false };
MSG charMsg = fakeMsgForChar.GetCharMsg(aWidget->GetWindowHandle());
NativeKey nativeKey(aWidget, charMsg, modKeyState);
nativeKey.HandleCharMessage(charMsg);
}

21
widget/windows/KeyboardLayout.h
View File

@ -281,10 +281,29 @@ class MOZ_STACK_CLASS NativeKey
friend class KeyboardLayout;
public:
struct FakeCharMsg
{
UINT mCharCode;
UINT mScanCode;
bool mIsDeadKey;
MSG GetCharMsg(HWND aWnd) const
{
MSG msg;
msg.hwnd = aWnd;
msg.message = mIsDeadKey ? WM_DEADCHAR : WM_CHAR;
msg.wParam = static_cast<WPARAM>(mCharCode);
msg.lParam = static_cast<LPARAM>(mScanCode);
msg.time = 0;
msg.pt.x = msg.pt.y = 0;
return msg;
}
};
NativeKey(nsWindowBase* aWidget,
const MSG& aKeyOrCharMessage,
const ModifierKeyState& aModKeyState,
const nsFakeCharMessage* aFakeCharMessage = nullptr);
const FakeCharMsg* aFakeCharMsg = nullptr);
/**
* Handle WM_KEYDOWN message or WM_SYSKEYDOWN message. The instance must be

20
widget/windows/nsWindowDefs.h
View File

@ -214,26 +214,6 @@ static const uint32_t sModifierKeyMap[][3] = {
*
**************************************************************/
// Used in OnKeyDown
struct nsAlternativeCharCode; // defined in nsGUIEvent.h
struct nsFakeCharMessage {
UINT mCharCode;
UINT mScanCode;
bool mIsDeadKey;
MSG GetCharMessage(HWND aWnd) const
{
MSG msg;
msg.hwnd = aWnd;
msg.message = mIsDeadKey ? WM_DEADCHAR : WM_CHAR;
msg.wParam = static_cast<WPARAM>(mCharCode);
msg.lParam = static_cast<LPARAM>(mScanCode);
msg.time = 0;
msg.pt.x = msg.pt.y = 0;
return msg;
}
};
// Used for synthesizing events
struct KeyPair {
uint8_t mGeneral;