diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:00:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:00:33 +0000 |
| commit | 5abb6dece78d9c7639511830590e0f447790fa82 (patch) | |
| tree | f258b8d0279100d43ac1127a5c38699a884b326f | |
| parent | bf2273d0adce6aae0a8c93f74d5cafe32e341674 (diff) | |
HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux. may harm webkit functionality temporarily. to be backed-out.
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 3 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 6a2449cf4b..b9bab491f3 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -684,6 +684,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) // so that we don't expose the llqtwebkit header in viewer code switch (target_type) { +#if !LL_LINUX case LLQtWebKit::LTT_TARGET_NONE: return LLPluginClassMedia::TARGET_NONE; @@ -692,7 +693,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) case LLQtWebKit::LTT_TARGET_EXTERNAL: return LLPluginClassMedia::TARGET_EXTERNAL; - +#endif default: return LLPluginClassMedia::TARGET_OTHER; } diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 02dba41f2a..d1f06147d6 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -526,13 +526,14 @@ private: // Any special-case handling we want to do for particular keys... switch((KEY)key) { +#if !LL_LINUX // ASCII codes for some standard keys case LLQtWebKit::KEY_BACKSPACE: utf8_text = (char)8; break; case LLQtWebKit::KEY_TAB: utf8_text = (char)9; break; case LLQtWebKit::KEY_RETURN: utf8_text = (char)13; break; case LLQtWebKit::KEY_PAD_RETURN: utf8_text = (char)13; break; case LLQtWebKit::KEY_ESCAPE: utf8_text = (char)27; break; - +#endif default: break; } @@ -544,7 +545,9 @@ private: uint32_t native_modifiers = 0; deserializeKeyboardData( native_key_data, native_scan_code, native_virtual_key, native_modifiers ); +#if !LL_LINUX LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, key_event, (uint32_t)key, utf8_text.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers); +#endif checkEditState(); }; @@ -553,8 +556,12 @@ private: // void unicodeInput( const std::string &utf8str, LLQtWebKit::EKeyboardModifier modifiers, LLSD native_key_data = LLSD::emptyMap()) { +#if !LL_LINUX uint32_t key = LLQtWebKit::KEY_NONE; - +#else + uint32_t key = 0; +#endif + // std::cerr << "unicode input, native_key_data = " << native_key_data << std::endl; if(utf8str.size() == 1) @@ -569,8 +576,10 @@ private: uint32_t native_modifiers = 0; deserializeKeyboardData( native_key_data, native_scan_code, native_virtual_key, native_modifiers ); +#if !LL_LINUX LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_DOWN, (uint32_t)key, utf8str.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers); LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_UP, (uint32_t)key, utf8str.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers); +#endif checkEditState(); }; |