diff options
Diffstat (limited to 'widget/TextEvents.h')
-rw-r--r-- | widget/TextEvents.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/widget/TextEvents.h b/widget/TextEvents.h index 736effeeab..6c29341144 100644 --- a/widget/TextEvents.h +++ b/widget/TextEvents.h @@ -111,6 +111,10 @@ protected: , mLocation(nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD) , mAccessKeyForwardedToChild(false) , mUniqueId(0) +#ifdef XP_MACOSX + , mNativeModifierFlags(0) + , mNativeKeyCode(0) +#endif // #ifdef XP_MACOSX , mKeyNameIndex(mozilla::KEY_NAME_INDEX_Unidentified) , mCodeNameIndex(CODE_NAME_INDEX_UNKNOWN) , mInputMethodAppState(eNotHandled) @@ -136,6 +140,10 @@ public: , mLocation(nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD) , mAccessKeyForwardedToChild(false) , mUniqueId(0) +#ifdef XP_MACOSX + , mNativeModifierFlags(0) + , mNativeKeyCode(0) +#endif // #ifdef XP_MACOSX , mKeyNameIndex(mozilla::KEY_NAME_INDEX_Unidentified) , mCodeNameIndex(CODE_NAME_INDEX_UNKNOWN) , mInputMethodAppState(eNotHandled) @@ -196,6 +204,15 @@ public: // CODE_NAME_INDEX_USE_STRING. nsString mCodeValue; +#ifdef XP_MACOSX + // Values given by a native NSEvent, for use with Cocoa NPAPI plugins. + nsString mNativeCharacters; + nsString mNativeCharactersIgnoringModifiers; + // If this is non-empty, create a text event for plugins instead of a + // keyboard event. + nsString mPluginTextEventString; +#endif // #ifdef XP_MACOSX + // OS-specific native event can optionally be preserved void* mNativeKeyEvent; // A DOM keyCode value or 0. If a keypress event whose mCharCode is 0, this @@ -223,6 +240,12 @@ public: // over long periods. uint32_t mUniqueId; +#ifdef XP_MACOSX + // Values given by a native NSEvent, for use with Cocoa NPAPI plugins. + uint32_t mNativeModifierFlags; + uint16_t mNativeKeyCode; +#endif // #ifdef XP_MACOSX + // DOM KeyboardEvent.key KeyNameIndex mKeyNameIndex; // DOM KeyboardEvent.code @@ -374,6 +397,14 @@ public: // is destroyed. mNativeKeyEvent = nullptr; mUniqueId = aEvent.mUniqueId; +#ifdef XP_MACOSX + mNativeKeyCode = aEvent.mNativeKeyCode; + mNativeModifierFlags = aEvent.mNativeModifierFlags; + mNativeCharacters.Assign(aEvent.mNativeCharacters); + mNativeCharactersIgnoringModifiers. + Assign(aEvent.mNativeCharactersIgnoringModifiers); + mPluginTextEventString.Assign(aEvent.mPluginTextEventString); +#endif mInputMethodAppState = aEvent.mInputMethodAppState; mIsSynthesizedByTIP = aEvent.mIsSynthesizedByTIP; } |