From 380c3d6ea92b8de2b4ca282bfb59749790468aa3 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Sun, 27 Aug 2006 00:03:58 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11016 --- api/x_opengl.C | 24 +++++------------------- checkin_notes | 6 ++++++ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/api/x_opengl.C b/api/x_opengl.C index f7d4e06f73..23dd0a8042 100644 --- a/api/x_opengl.C +++ b/api/x_opengl.C @@ -283,8 +283,11 @@ static void make_new_window(int mode) { } #ifdef __APPLE__ - glutWMCloseFunc(CloseWindow); // Enable the window's close box - BringAppToFront(); + glutWMCloseFunc(CloseWindow); // Enable the window's close box + BringAppToFront(); + // Show window only after a successful call to throttled_app_render(); + // this avoids momentary display of old image when screensaver restarts + // which made image appear to "jump." need_show = true; #endif @@ -506,22 +509,6 @@ void restart() { // // if (glut_is_initialized ) { -#ifdef __APPLE__ - if (boinc_is_standalone()) { - app_debug_msg( - "Assuming user pressed 'close'... means we're exiting now.\n" - ); - } else { - app_debug_msg( - "Assuming user pressed 'quit'... means we're exiting now.\n" - ); - } - - if (boinc_delete_file(LOCKFILE) != 0) { - perror ("Failed to remove lockfile..\n"); - } - return; -#else if (boinc_is_standalone()) { app_debug_msg( "Assuming user pressed 'close'... means we're exiting now.\n" @@ -531,7 +518,6 @@ void restart() { } return; } -#endif } // re-install the exit-handler to catch glut's notorious exits()... diff --git a/checkin_notes b/checkin_notes index 5d1fd13eb2..e6f3b2c872 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9375,3 +9375,9 @@ Kevin 25 Aug 2006 sg_ViewTabPage.cpp sg_ViewTabPage.h +Charlie 26 Aug 2006 + -Mac: Add a comment; remove bogus Mac-only code from restart() + in x_opengl.C. + + api/ + x_opengl.C