X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=a839ae6f2052a4d6a4cba7ba2449fd5e9da8b257;hb=846fd2169832c8938f04386139de746a06e80d4b;hp=5d797d009ade2dd0560bcf91c1efebd404f8b462;hpb=8aeb650d165cba3e78928a3696d139cd64c36570;p=flightgear.git diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx index 5d797d009..a839ae6f2 100644 --- a/src/GUI/gui_funcs.cxx +++ b/src/GUI/gui_funcs.cxx @@ -30,6 +30,10 @@ # include #endif +#ifdef HAVE_WINDOWS_H +#include +#endif + #include #include @@ -60,8 +64,8 @@ # include #endif -#ifdef SG_MAC -# include "FGCocoaMenuBar.hxx" // for cocoaOpenUrl +#if defined(SG_MAC) +# include // for cocoaOpenUrl #endif #include "gui.h" @@ -145,7 +149,7 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable) string msg = txt; msg += '\n'; msg += throwable.getFormattedMessage(); - if (!std::strlen(throwable.getOrigin()) != 0) { + if (std::strlen(throwable.getOrigin()) != 0) { msg += "\n (reported by "; msg += throwable.getOrigin(); msg += ')'; @@ -165,10 +169,11 @@ void helpCb() openBrowser( "Docs/index.html" ); } -bool openBrowser(string address) +bool openBrowser(const std::string& aAddress) { bool ok = true; - + string address(aAddress); + // do not resolve addresses with given protocol, i.e. "http://...", "ftp://..." if (address.find("://")==string::npos) { @@ -192,22 +197,7 @@ bool openBrowser(string address) } cocoaOpenUrl(address); - return ok; -#endif - -#ifndef _WIN32 - - string command = globals->get_browser(); - string::size_type pos; - if ((pos = command.find("%u", 0)) != string::npos) - command.replace(pos, 2, address); - else - command += " " + address; - - command += " &"; - ok = (system( command.c_str() ) == 0); - -#else // _WIN32 +#elif defined _WIN32 // Look for favorite browser char win32_name[1024]; @@ -218,7 +208,17 @@ bool openBrowser(string address) # endif ShellExecute ( NULL, "open", win32_name, NULL, NULL, SW_SHOWNORMAL ) ; +#else + // Linux, BSD, SGI etc + string command = globals->get_browser(); + string::size_type pos; + if ((pos = command.find("%u", 0)) != string::npos) + command.replace(pos, 2, address); + else + command += " \"" + address +"\""; + command += " &"; + ok = (system( command.c_str() ) == 0); #endif mkDialog("The file is shown in your web browser window."); @@ -234,12 +234,11 @@ void fgHiResDump() char *filename = new char [24]; static int count = 1; - static const SGPropertyNode *master_freeze - = fgGetNode("/sim/freeze/master"); + SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master"); bool freeze = master_freeze->getBoolValue(); if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); + master_freeze->setBoolValue(true); } fgSetBool("/sim/menubar/visibility", false); @@ -420,7 +419,7 @@ void fgHiResDump() fgSetBool("/sim/menubar/visibility", menu_status); if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } #endif // #if defined( TR_HIRES_SNAP) @@ -438,7 +437,24 @@ namespace { using namespace flightgear; - class GUISnapShotOperation : + SGPath nextScreenshotPath(const std::string& screenshotDir) + { + char filename[32]; + static int count = 1; + while (count < 1000) { + snprintf(filename, 32, "fgfs-screen-%03d.png", count++); + + SGPath p(screenshotDir); + p.append(filename); + if (!p.exists()) { + return p; + } + } + + return SGPath(); + } + + class GUISnapShotOperation : public GraphicsContextOperation { public: @@ -481,28 +497,16 @@ namespace string dir = fgGetString("/sim/paths/screenshot-dir"); if (dir.empty()) - dir = fgGetString("/sim/fg-current"); + dir = SGPath::desktop().str(); _path.set(dir + '/'); if (_path.create_dir( 0755 )) { SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '" << dir << "'. Trying home directory."); - dir = fgGetString("/sim/fg-home"); - } - - char filename[24]; - static int count = 1; - while (count < 1000) { - snprintf(filename, 24, "fgfs-screen-%03d.png", count++); - - SGPath p(dir); - p.append(filename); - if (!p.exists()) { - _path.set(p.str()); - break; - } + dir = globals->get_fg_home(); } + _path = nextScreenshotPath(dir); _xsize = fgGetInt("/sim/startup/xsize"); _ysize = fgGetInt("/sim/startup/ysize"); @@ -549,79 +553,16 @@ namespace SGPath _path; }; -} +} // of anonymous namespace osg::ref_ptr GUISnapShotOperation::_snapShotOp; // do a screen snap shot bool fgDumpSnapShot () { -#if 1 // start snap shot operation, while needs to be executed in // graphics context return GUISnapShotOperation::start(); -#else - // obsolete code => remove when new code is stable - static SGConstPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master"); - - bool freeze = master_freeze->getBoolValue(); - if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); - } - - int mouse = fgGetMouseCursor(); - fgSetMouseCursor(MOUSE_CURSOR_NONE); - - fgSetBool("/sim/signals/screenshot", true); - - FGRenderer *renderer = globals->get_renderer(); - renderer->resize( fgGetInt("/sim/startup/xsize"), - fgGetInt("/sim/startup/ysize") ); - - // we need two render frames here to clear the menu and cursor - // ... not sure why but doing an extra fgRenderFrame() shouldn't - // hurt anything - renderer->update( true ); - renderer->update( true ); - - string dir = fgGetString("/sim/paths/screenshot-dir"); - if (dir.empty()) - dir = fgGetString("/sim/fg-current"); - - SGPath path(dir + '/'); - if (path.create_dir( 0755 )) { - SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '" - << dir << "'. Trying home directory."); - dir = fgGetString("/sim/fg-home"); - } - - char filename[24]; - static int count = 1; - while (count < 1000) { - snprintf(filename, 24, "fgfs-screen-%03d.png", count++); - - SGPath p(dir); - p.append(filename); - if (!p.exists()) { - path.set(p.str()); - break; - } - } - - bool result = sg_glDumpWindow(path.c_str(), - fgGetInt("/sim/startup/xsize"), - fgGetInt("/sim/startup/ysize")); - - fgSetString("/sim/paths/screenshot-last", path.c_str()); - fgSetBool("/sim/signals/screenshot", false); - - fgSetMouseCursor(mouse); - - if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); - } - return result; -#endif } // do an entire scenegraph dump @@ -631,12 +572,11 @@ void fgDumpSceneGraph() string message; static int count = 1; - static const SGPropertyNode *master_freeze - = fgGetNode("/sim/freeze/master"); + SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master"); bool freeze = master_freeze->getBoolValue(); if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); + master_freeze->setBoolValue(true); } while (count < 1000) { @@ -662,7 +602,7 @@ void fgDumpSceneGraph() delete [] filename; if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } @@ -674,12 +614,11 @@ void fgDumpTerrainBranch() string message; static int count = 1; - static const SGPropertyNode *master_freeze - = fgGetNode("/sim/freeze/master"); + SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master"); bool freeze = master_freeze->getBoolValue(); if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); + master_freeze->setBoolValue(true); } while (count < 1000) { @@ -705,26 +644,22 @@ void fgDumpTerrainBranch() delete [] filename; if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } void fgPrintVisibleSceneInfoCommand() { - static const SGPropertyNode *master_freeze - = fgGetNode("/sim/freeze/master"); + SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master"); bool freeze = master_freeze->getBoolValue(); if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); + master_freeze->setBoolValue(true); } flightgear::printVisibleSceneInfo(globals->get_renderer()); if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } - - -