Merge pull request #6193 from secondlife/release/26.4

Release/26.4

1 files changed, 45 insertions, 1 deletions

diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index caf804f915..3f143cb9ac 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -116,6 +116,7 @@ private:
     std::string mRootCachePath;
     std::string mCefLogFile;
     bool mCefLogVerbose;
+    U32 mCefRemoteDebuggingPort;
     std::vector<std::string> mPickedFiles;
     VolumeCatcher mVolumeCatcher;
     F32 mCurVolume;
@@ -157,6 +158,7 @@ MediaPluginBase(host_send_func, host_user_data)
     mCanSelectAll = false;
     mCefLogFile = "";
     mCefLogVerbose = false;
+    mCefRemoteDebuggingPort = 0;
     mPickedFiles.clear();
     mCurVolume = 0.0;
 
@@ -709,6 +711,8 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
                 settings.webgl_enabled = true;
                 settings.log_file = mCefLogFile;
                 settings.log_verbose = mCefLogVerbose;
+                settings.enable_remote_debug = (mCefRemoteDebuggingPort != 0);
+                settings.remote_debugging_port = mCefRemoteDebuggingPort;
                 settings.autoplay_without_gesture = true;
 
                 std::vector<std::string> custom_schemes(1, "secondlife");
@@ -773,6 +777,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 
                 mCefLogFile = message_in.getValue("cef_log_file");
                 mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log");
+                mCefRemoteDebuggingPort = message_in.getValueU32("cef_remote_debugging_port");
             }
             else if (message_name == "size_change")
             {
@@ -911,7 +916,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 
                 keyEvent(key_event, native_key_data);
 
-#elif LL_WINDOWS
+#else
                 std::string event = message_in.getValue("event");
                 LLSD native_key_data = message_in.getValueLLSD("native_key_data");
 
@@ -933,6 +938,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
             {
                 mEnableMediaPluginDebugging = message_in.getValueBoolean("enable");
             }
+#if LL_LINUX
+            else if (message_name == "enable_pipewire_volume_catcher")
+            {
+                bool enable = message_in.getValueBoolean("enable");
+                mVolumeCatcher.onEnablePipeWireVolumeCatcher(enable);
+            }
+#endif
             if (message_name == "pick_file_response")
             {
                 LLSD file_list_llsd = message_in.getValueLLSD("file_list");
@@ -1095,6 +1107,28 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, LLSD native_key_dat
 
     mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);
 #endif
+
+#if LL_LINUX
+
+    uint32_t native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());       // this is actually the SDL event.key.keysym.sym;
+    uint32_t native_virtual_key_win = (uint32_t)(native_key_data["virtual_key_win"].asInteger());
+    uint32_t native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+
+    // only for non-printable keysyms, the actual text input is done in unicodeInput() below
+    if (native_virtual_key <= 0x1b || native_virtual_key >= 0x7f)
+    {
+        // set keypad flag, not sure if this even does anything
+        bool keypad = false;
+        if (native_virtual_key_win >= 0x60 && native_virtual_key_win <= 0x6f)
+        {
+            keypad = true;
+        }
+
+        // yes, we send native_virtual_key_win twice because native_virtual_key breaks it
+        mCEFLib->nativeKeyboardEventSDL2(key_event, native_virtual_key, native_modifiers, keypad);
+    }
+
+#endif // LL_LINUX
 };
 
 void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD::emptyMap())
@@ -1125,6 +1159,16 @@ void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD
     U64 lparam = ll_U32_from_sd(native_key_data["l_param"]);
     mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);
 #endif
+
+#if LL_LINUX
+
+    uint32_t native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger());
+    uint32_t native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+    uint32_t native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+
+    mCEFLib->nativeKeyboardEvent(dullahan::KE_KEY_DOWN, native_scan_code, native_virtual_key, native_modifiers);
+
+#endif // LL_LINUX
 };
 
 ////////////////////////////////////////////////////////////////////////////////