*** empty log message ***

svn path=/trunk/boinc/; revision=10667

checkin_notes

@@ -7626,3 +7626,21 @@ David  17 July 2006
     lib/
         app_ipc.h
         util.C,h
+
+
+Charlie 17 July 2006
+    - Mac: Disable "Show Graphics" button and screensaver graphics when 
+        client running as a daemon; show warning dialog if user presses 
+        "Show Graphics" button during remote RPC.
+    - Added SS_STATUS_DAEMONALLOWSNOGRAPHICS for daemon case; Mac 
+        screensaver shows different message for daemon case.
+    
+    client/
+        client_state.C
+        ss_logic.C,h
+    clientgui/
+        ViewWork.cpp
+        /mac/
+            mac_saver_module.cpp
+    lib/
+        gui_rpc_client.h

client/client_state.C

@@ -176,6 +176,15 @@ int CLIENT_STATE::init() {
     }
 #endif
 
+#ifdef __APPLE__
+    if (executing_as_daemon) {
+        msg_printf(NULL, MSG_INFO,
+            "BOINC is running as a daemon.  No application graphics will be available."
+        );
+        disable_graphics = true;
+    }
+#endif
+
     parse_account_files();
     parse_statistics_files();
 

client/ss_logic.C

@@ -132,7 +132,7 @@ void SS_LOGIC::poll() {
 
     if (gstate.disable_graphics) {
         reset();
-        ss_status = SS_STATUS_NOGRAPHICSAPPSEXECUTING;
+        ss_status = SS_STATUS_DAEMONALLOWSNOGRAPHICS;
         return;
     }
 

client/ss_logic.h

@@ -40,6 +40,8 @@
 #define SS_STATUS_QUIT                              8
     // not requested to provide SSG
 #define SS_STATUS_NOPROJECTSDETECTED                9
+    // SSG unsupported; client running as daemon
+#define SS_STATUS_DAEMONALLOWSNOGRAPHICS            10
 
 class SS_LOGIC {
 public:

clientgui/ViewWork.cpp

@@ -206,7 +206,7 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) {
     pFrame->UpdateStatusText(_("Showing graphics for task..."));
 
     // TODO: implement hide as well as show
-#ifdef _WIN32
+#if (defined(_WIN32) || defined(__WXMAC__))
     pDoc->GetConnectedComputerName(strMachineName);
     if (!pDoc->IsComputerNameLocal(strMachineName)) {
         iAnswer = ::wxMessageBox(

clientgui/mac/mac_saver_module.cpp

@@ -142,6 +142,7 @@ const char *  BOINCSuspendedMsg = "BOINC is currently suspended.";
 const char *  BOINCNoAppsExecutingMsg = "BOINC is currently idle.";
 const char *  BOINCNoProjectsDetectedMsg = "BOINC is not attached to any projects. Please attach to projects using the BOINC Manager.";
 const char *  BOINCNoGraphicAppsExecutingMsg = "Project does not support screensaver graphics: ";
+const char *  BOINCNoGraphicsSupportedMsg = "This BOINC installation does not support screensaver graphics: ";
 const char *  BOINCUnrecoverableErrorMsg = "Sorry, an unrecoverable error occurred";
 const char *  BOINCTestmodeMg = "This BOINC screensaver does not support Test mode";
 //const char *  BOINCExitedSaverMode = "BOINC is no longer in screensaver mode.";
@@ -352,8 +353,10 @@ int drawGraphics(GrafPtr aPort) {
             break;
 #endif
         case SS_STATUS_NOGRAPHICSAPPSEXECUTING:
+        case SS_STATUS_DAEMONALLOWSNOGRAPHICS:
             if (msgBuf[0] == 0) {
-                strcpy(msgBuf, BOINCNoGraphicAppsExecutingMsg);
+                strcpy(msgBuf, (SaverState_CoreClientSetToSaverMode == SS_STATUS_NOGRAPHICSAPPSEXECUTING) ? 
+                                BOINCNoGraphicAppsExecutingMsg : BOINCNoGraphicsSupportedMsg);
                 setBannerText(msgBuf, aPort);
             }
             if (gStatusMessageUpdated) {

lib/gui_rpc_client.h

@@ -77,6 +77,7 @@
 #define SS_STATUS_NOGRAPHICSAPPSEXECUTING           7
 #define SS_STATUS_QUIT                              8
 #define SS_STATUS_NOPROJECTSDETECTED                9
+#define SS_STATUS_DAEMONALLOWSNOGRAPHICS            10
 
 // see lib/app_ipc.h for explanation
 //