Merge branch 'master' into bugfix/clump_atomic_models

Author: FileEX

.github/workflows/build.yaml

@@ -52,7 +52,7 @@ jobs:
 
   macOS:
     name: macOS
-    runs-on: macOS-13
+    runs-on: macOS-15
     steps:
       - uses: actions/checkout@v4
 
@@ -64,7 +64,7 @@ jobs:
         run: brew link --overwrite mysql
 
       - name: Run Build
-        run: ./linux-build.sh --os=macosx
+        run: ./linux-build.sh
 
   linux:
     strategy:
@@ -78,4 +78,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run Build
-        run: ./linux-build.sh --arch=${{ matrix.architecture }}
+        run: /docker-entrypoint.sh --arch=${{ matrix.architecture }}

Client/cefweb/CWebCore.cpp

@@ -479,6 +479,15 @@ void CWebCore::OnPostScreenshot()
     }
 }
 
+void CWebCore::OnFPSLimitChange(std::uint16_t fps)
+{
+    dassert(g_pCore->GetNetwork() != nullptr);            // Ensure network module is loaded
+    for (auto& webView : m_WebViews)
+    {
+        webView->GetCefBrowser()->GetHost()->SetWindowlessFrameRate(fps);
+    }
+}
+
 void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     if (!m_pFocusedWebView ||
@@ -502,7 +511,7 @@ void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
     if ((keyEvent.type == KEYEVENT_CHAR) && isKeyDown(VK_RMENU))
     {
         HKL   current_layout = ::GetKeyboardLayout(0);
-        SHORT scan_res = ::VkKeyScanExW(wParam, current_layout);
+        SHORT scan_res = ::VkKeyScanExW(static_cast<WCHAR>(wParam), current_layout);
         if ((HIBYTE(scan_res) & (2 | 4)) == (2 | 4))
         {
             keyEvent.modifiers &= ~(EVENTFLAG_CONTROL_DOWN | EVENTFLAG_ALT_DOWN);

Client/cefweb/CWebCore.h

@@ -96,6 +96,8 @@ class CWebCore : public CWebCoreInterface
     void OnPreScreenshot();
     void OnPostScreenshot();
 
+    void OnFPSLimitChange(std::uint16_t fps) override;
+
     bool SetGlobalAudioVolume(float fVolume);
 
     bool        UpdateListsFromMaster();

Client/cefweb/CWebView.cpp

@@ -54,7 +54,7 @@ void CWebView::Initialise()
 {
     // Initialise the web session (which holds the actual settings) in in-memory mode
     CefBrowserSettings browserSettings;
-    browserSettings.windowless_frame_rate = g_pCore->GetFrameRateLimit();
+    browserSettings.windowless_frame_rate = g_pCore->GetFPSLimiter()->GetFPSTarget();
     browserSettings.javascript_access_clipboard = cef_state_t::STATE_DISABLED;
     browserSettings.javascript_dom_paste = cef_state_t::STATE_DISABLED;
     browserSettings.webgl = cef_state_t::STATE_ENABLED;

Client/cefweb/premake5.lua

@@ -6,7 +6,6 @@ project "Client Webbrowser"
 
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
-		linkoptions { "/SAFESEH:NO" }
 		buildoptions { "-Zm130" }
 
 	filter {}