Merge pull request #6688 from BOINC/mac_ss_tweaks

Mac ss tweaks

Author: AenBleidd

client/gui_rpc_server_ops.cpp

@@ -24,6 +24,7 @@
 #include <libproc.h>
 #include "sandbox.h"
 #include "mac_branding.h"
+extern int compareOSVersionTo(int toMajor, int toMinor);
 #endif
 
 #ifdef _WIN32
@@ -1501,34 +1502,36 @@ static void handle_run_graphics_app(GUI_RPC_CONN& grc) {
         return;
     }
 
-    // As of MacOS 14.0, the legacyScreenSaver sandbox prevents using
-    // bootstrap_look_up, so we launch a bridging utility to relay Mach
-    // communications between the graphics apps and the legacyScreenSaver.
-    if (gfx_ss_bridge_pid == 0) {
-        need_to_launch_gfx_ss_bridge = true;
-    } else if (waitpid(gfx_ss_bridge_pid, 0, WNOHANG)) {
-        gfx_ss_bridge_pid = 0;
-        need_to_launch_gfx_ss_bridge = true;
-    }
-    if (need_to_launch_gfx_ss_bridge) {
-        if (g_use_sandbox) {
-
-            snprintf(gfx_switcher_path, sizeof(gfx_switcher_path),
-                "/Library/Screen Savers/%s.saver/Contents/Resources/gfx_switcher",
-                saverName[iBrandID]
-            );
+    if (compareOSVersionTo(14, 0) >= 0) {
+        // As of MacOS 14.0, the legacyScreenSaver sandbox prevents using
+        // bootstrap_look_up, so we launch a bridging utility to relay Mach
+        // communications between the graphics apps and the legacyScreenSaver.
+        if (gfx_ss_bridge_pid == 0) {
+            need_to_launch_gfx_ss_bridge = true;
+        } else if (waitpid(gfx_ss_bridge_pid, 0, WNOHANG)) {
+            gfx_ss_bridge_pid = 0;
+            need_to_launch_gfx_ss_bridge = true;
         }
-        argv[0] = const_cast<char*>("gfx_switcher");
-        argv[1] = "-run_bridge";
-        argv[2] = gfx_switcher_path;
-        argc = 3;
-        if (!theScreensaverLoginUser.empty()) {
-            argv[argc++] = "--ScreensaverLoginUser";
-            safe_strcpy(screensaverLoginUser, theScreensaverLoginUser.c_str());
-            argv[argc++] = screensaverLoginUser;
+        if (need_to_launch_gfx_ss_bridge) {
+            if (g_use_sandbox) {
+
+                snprintf(gfx_switcher_path, sizeof(gfx_switcher_path),
+                    "/Library/Screen Savers/%s.saver/Contents/Resources/gfx_switcher",
+                    saverName[iBrandID]
+                );
+            }
+            argv[0] = const_cast<char*>("gfx_switcher");
+            argv[1] = "-run_bridge";
+            argv[2] = gfx_switcher_path;
+            argc = 3;
+            if (!theScreensaverLoginUser.empty()) {
+                argv[argc++] = "--ScreensaverLoginUser";
+                safe_strcpy(screensaverLoginUser, theScreensaverLoginUser.c_str());
+                argv[argc++] = screensaverLoginUser;
+            }
+            argv[argc] = 0;
+            retval = run_program(current_dir, gfx_switcher_path, argc, argv, gfx_ss_bridge_pid);
         }
-        argv[argc] = 0;
-        retval = run_program(current_dir, gfx_switcher_path, argc, argv, gfx_ss_bridge_pid);
     }
 
     if (slot == -1) {

lib/procinfo_mac.cpp

@@ -137,11 +137,14 @@ int procinfo_setup(PROC_MAP& pm) {
         p.swap_size = (double)virtual_mem * 1024.;
         p.user_time += 60. * (float)hours;
         p.is_boinc_app = (p.id == pid || strcasestr(p.command, "boinc"));
-        // Ideally, we should count ScreenSaverEngine.app as a BOINC process
-        // only if BOINC is set as the screensaver.  We could set a flag in
-        // the client when the get_screensaver_tasks rpc is called, but that
-        // would not be 100% reliable for several reasons.
-        if (strcasestr(p.command, "screensaverengine")) p.is_boinc_app = true;
+        // Ideally, we should count ScreenSaverEngine or legacyScreenSaver
+        // as a BOINC process only if BOINC is set as the screensaver. We
+        // could set a flag in the client when the get_screensaver_tasks
+        // rpc is called, but that would not be 100% reliable for several
+        // reasons.
+        //
+        // Check for either ScreenSaverEngine or legacyScreenSaver
+        if (strcasestr(p.command, "screensaver")) p.is_boinc_app = true;
 
         // We do not mark Mac processes as low priority because some processes
         // (e.g., Finder) change priority frequently, which would cause