diff options
| author | callum_linden <none@none> | 2015-09-16 22:14:55 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-09-16 22:14:55 -0700 |
| commit | 6a119e327d7b7196e03581561545fb8501c79067 (patch) | |
| tree | 88a2ad5a14afc16ae6307e93ad41e81b848f5b03 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | 43b98fba8b84dbec66ca67af61f24e9d7ab41259 (diff) | |
tmp chckin - still needs latest llceflib to build
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index e812341f8c..c668076d93 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -503,11 +503,14 @@ void MediaPluginCEF::receiveMessage(const char* message_string) S32 key = message_in.getValueS32("key"); if (event == "down") { - mLLCEFLib->keyPress(key, true); + //mLLCEFLib->keyPress(key, true); + mLLCEFLib->keyboardEvent(KE_KEY_DOWN, (uint32_t)key, 0, KM_MODIFIER_NONE, 0, 0, 0); + } else if (event == "up") { - mLLCEFLib->keyPress(key, false); + //mLLCEFLib->keyPress(key, false); + mLLCEFLib->keyboardEvent(KE_KEY_UP, (uint32_t)key, 0, KM_MODIFIER_NONE, 0, 0, 0); } #elif LL_WINDOWS @@ -681,7 +684,8 @@ void MediaPluginCEF::keyEvent(EKeyEvent key_event, int key, EKeyboardModifier mo void MediaPluginCEF::unicodeInput(const std::string &utf8str, EKeyboardModifier modifiers, LLSD native_key_data = LLSD::emptyMap()) { #if LL_DARWIN - mLLCEFLib->keyPress(utf8str[0], true); + //mLLCEFLib->keyPress(utf8str[0], true); + mLLCEFLib->keyboardEvent(KE_KEY_DOWN, (uint32_t)(utf8str[0]), 0, KM_MODIFIER_NONE, 0, 0, 0); #elif LL_WINDOWS U32 msg = ll_U32_from_sd(native_key_data["msg"]); U32 wparam = ll_U32_from_sd(native_key_data["w_param"]); |