From b6bed4b2d342c654369a6159095c9fbaeec799d1 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 8 May 2006 22:45:10 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10114 --- api/x_opengl.C | 7 + checkin_notes | 7 + lib/util.C | 1 - mac_build/boinc.xcodeproj/project.pbxproj | 398 ---------------------- 4 files changed, 14 insertions(+), 399 deletions(-) diff --git a/api/x_opengl.C b/api/x_opengl.C index 8d0ff864e8..97fe9181d0 100644 --- a/api/x_opengl.C +++ b/api/x_opengl.C @@ -118,6 +118,12 @@ void mouse_click_move(int x, int y){ } } +void mouse_move(int x, int y) { + if (current_graphics_mode == MODE_FULLSCREEN){ + set_mode(MODE_HIDE_GRAPHICS); + } +} + static void maybe_render() { int width, height; if (visible && (current_graphics_mode != MODE_HIDE_GRAPHICS)) { @@ -166,6 +172,7 @@ static void make_new_window(int mode) { glutKeyboardUpFunc(keyboardU); glutMouseFunc(mouse_click); glutMotionFunc(mouse_click_move); + glutPassiveMotionFunc(mouse_move); glutDisplayFunc(maybe_render); glEnable(GL_DEPTH_TEST); #ifdef __APPLE__ diff --git a/checkin_notes b/checkin_notes index e78e3f0ce2..b3986d6ae8 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4532,4 +4532,11 @@ Rom 8 May 2006 diagnostics_win.C, .h error_numbers.h stackwalker_win.cpp + util.C +Charlie 8 May 2006 + - Mac: Add callback glutPassiveMotionFunc(mouse_move) to dismiss + screensaver on mouse move when no mouse button is pressed. + + api/ + x_opengl.C diff --git a/lib/util.C b/lib/util.C index 9a866ae929..1867c2283a 100755 --- a/lib/util.C +++ b/lib/util.C @@ -973,7 +973,6 @@ const char* boincerror(int which_error) { case ERR_NOT_FOUND: return "not found"; case ERR_NO_EXIT_STATUS: return "no exit status in scheduler request"; case ERR_FILE_MISSING: return "file missing"; - case ERR_NESTED_UNHANDLED_EXCEPTION_DETECTED: return "nested unhandled exception"; case ERR_SEMGET: return "system get semaphore"; case ERR_SEMCTL: return "system control semaphore"; case ERR_SEMOP: return "system op semaphore"; diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index cb7c599a65..b3dd3fca39 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3141,40 +3141,6 @@ }; name = ppc_Deployment; }; - DD9E2354091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INSTALL_PATH = /usr/local/lib; - LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = boinc; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E2356091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3241,38 +3207,6 @@ }; name = ppc_Deployment; }; - DD9E2358091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - HEADER_SEARCH_PATHS = "../../jpeg-6b"; - INSTALL_PATH = /usr/local/lib; - LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = boinc_graphics_api; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E235A091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3335,36 +3269,6 @@ }; name = ppc_Deployment; }; - DD9E235C091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - INSTALL_PATH = /usr/local/lib; - LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = boinc_api; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E235E091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3412,23 +3316,6 @@ }; name = ppc_Deployment; }; - DD9E2360091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = SetVersion; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E2362091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3507,43 +3394,6 @@ }; name = ppc_Deployment; }; - DD9E2364091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INFOPLIST_FILE = "ScreenSaver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = BOINCSaver; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = saver; - }; - name = Default; - }; DD9E2366091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3637,53 +3487,6 @@ }; name = ppc_Deployment; }; - DD9E2368091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; - INSTALL_PATH = ""; - LIBRARY_SEARCH_PATHS = ( - /usr/lib/gcc/darwin/3.3, - "/Volumes/Moon/BOINC_Mac/wxMac-2.6.1/osx-build/lib", - ); - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-D__WXMAC", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-D_THREAD_SAFE", - "-D__WXMAC", - "-include", - ../clientgui/mac/config.h, - ); - OTHER_LDFLAGS = ( - "../../curl-7.15.3/lib/.libs/libcurl.a", - "-framework Carbon", - "-lcrypto", - "-lssl", - "-lz", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = boinc; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - UNSTRIPPED_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; - }; - name = Default; - }; DD9E236A091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3752,34 +3555,6 @@ }; name = ppc_Deployment; }; - DD9E236C091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INFOPLIST_FILE = "SystemMenu-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030"; - OTHER_CPLUSPLUSFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = SystemMenu; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E236E091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3897,69 +3672,6 @@ }; name = ppc_Deployment; }; - DD9E2370091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = NO; - GCC_CW_ASM_SYNTAX = NO; - GCC_PFE_FILE_C_DIALECTS = "c++"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; - HEADER_SEARCH_PATHS = ( - "../../wxMac-2.6.1/osx-build/lib/wx/include/mac-ansi-release-static-2.6", - "../../wxMac-2.6.1/include", - ); - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(USER_APPS_DIR)"; - LIBRARY_SEARCH_PATHS = ( - "../../wxMac-2.6.1/osx-build/lib", - ../lib, - /usr/lib/gcc/darwin/3.3, - ); - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-DHAVE_CONFIG_H", - "-D_FILE_OFFSET_BITS=64", - "-D_LARGE_FILES", - "-DNO_GCC_PRAGMA", - "-DNOCLIPBOARD", - "-D_THREAD_SAFE", - "-D__WXMAC__", - "-DHAVE_STRCASECMP_IN_STRING_H", - ); - OTHER_CPLUSPLUSFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", - "-DHAVE_CONFIG_H", - "-D_FILE_OFFSET_BITS=64", - "-D_LARGE_FILES", - "-DNO_GCC_PRAGMA", - "-DNOCLIPBOARD", - "-D_THREAD_SAFE", - "-D__WXMAC__", - "-DHAVE_STRCASECMP_IN_STRING_H", - ); - OTHER_LDFLAGS = ( - "-D_THREAD_SAFE", - "-lz", - "-lpthread", - "-liconv", - "-lz", - "-lm", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = BOINCManager; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = NO; - UNSTRIPPED_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E2372091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4024,32 +3736,6 @@ }; name = ppc_Deployment; }; - DD9E2374091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INFOPLIST_FILE = "Installer-Info.plist"; - INSTALL_PATH = "$(USER_APPS_DIR)"; - LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030"; - OTHER_CPLUSPLUSFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030"; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = Postinstall; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E2376091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4103,27 +3789,6 @@ }; name = ppc_Deployment; }; - DD9E2378091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_LDFLAGS = "-lboinc"; - OTHER_REZFLAGS = ""; - PREBINDING = NO; - PRODUCT_NAME = boinc_cmd; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E237A091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4175,26 +3840,6 @@ }; name = ppc_Deployment; }; - DD9E237C091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PREBINDING = NO; - PRODUCT_NAME = MakeAppIcon_h; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E237E091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4239,22 +3884,6 @@ }; name = ppc_Deployment; }; - DD9E2380091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = Build_All; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Default; - }; DD9E2382091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4289,20 +3918,6 @@ }; name = ppc_Deployment; }; - DD9E2384091CBDAE0048316E /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION_i386 = 4.0; - GCC_VERSION_ppc = 3.3; - MACOSX_DEPLOYMENT_TARGET = 10.3; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; - }; - name = Default; - }; DDA2D1570952A93E00D0B538 /* i386_Deployment */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4726,7 +4341,6 @@ DD9E2353091CBDAE0048316E /* ppc_Deployment */, DDA2D1570952A93E00D0B538 /* i386_Deployment */, DD9843D909920F220090855B /* Deployment */, - DD9E2354091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4738,7 +4352,6 @@ DD9E2357091CBDAE0048316E /* ppc_Deployment */, DDA2D1580952A93E00D0B538 /* i386_Deployment */, DD9843DA09920F220090855B /* Deployment */, - DD9E2358091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4750,7 +4363,6 @@ DD9E235B091CBDAE0048316E /* ppc_Deployment */, DDA2D1590952A93E00D0B538 /* i386_Deployment */, DD9843DB09920F220090855B /* Deployment */, - DD9E235C091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4762,7 +4374,6 @@ DD9E235F091CBDAE0048316E /* ppc_Deployment */, DDA2D15A0952A93E00D0B538 /* i386_Deployment */, DD9843DC09920F220090855B /* Deployment */, - DD9E2360091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4774,7 +4385,6 @@ DD9E2363091CBDAE0048316E /* ppc_Deployment */, DDA2D15B0952A93E00D0B538 /* i386_Deployment */, DD9843DD09920F220090855B /* Deployment */, - DD9E2364091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4786,7 +4396,6 @@ DD9E2367091CBDAE0048316E /* ppc_Deployment */, DDA2D15C0952A93E00D0B538 /* i386_Deployment */, DD9843DE09920F220090855B /* Deployment */, - DD9E2368091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4798,7 +4407,6 @@ DD9E236B091CBDAE0048316E /* ppc_Deployment */, DDA2D15D0952A93E00D0B538 /* i386_Deployment */, DD9843DF09920F220090855B /* Deployment */, - DD9E236C091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4810,7 +4418,6 @@ DD9E236F091CBDAE0048316E /* ppc_Deployment */, DDA2D15E0952A93E00D0B538 /* i386_Deployment */, DD9843E009920F220090855B /* Deployment */, - DD9E2370091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4822,7 +4429,6 @@ DD9E2373091CBDAE0048316E /* ppc_Deployment */, DDA2D15F0952A93E00D0B538 /* i386_Deployment */, DD9843E109920F220090855B /* Deployment */, - DD9E2374091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4834,7 +4440,6 @@ DD9E2377091CBDAE0048316E /* ppc_Deployment */, DDA2D1600952A93E00D0B538 /* i386_Deployment */, DD9843E209920F220090855B /* Deployment */, - DD9E2378091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4846,7 +4451,6 @@ DD9E237B091CBDAE0048316E /* ppc_Deployment */, DDA2D1610952A93E00D0B538 /* i386_Deployment */, DD9843E309920F220090855B /* Deployment */, - DD9E237C091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4858,7 +4462,6 @@ DD9E237F091CBDAE0048316E /* ppc_Deployment */, DDA2D1620952A93E00D0B538 /* i386_Deployment */, DD9843E409920F220090855B /* Deployment */, - DD9E2380091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment; @@ -4870,7 +4473,6 @@ DD9E2383091CBDAE0048316E /* ppc_Deployment */, DDA2D1630952A93E00D0B538 /* i386_Deployment */, DD9843E509920F220090855B /* Deployment */, - DD9E2384091CBDAE0048316E /* Default */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = ppc_Deployment;