X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=a839ae6f2052a4d6a4cba7ba2449fd5e9da8b257;hb=846fd2169832c8938f04386139de746a06e80d4b;hp=52eb06662e95582229c0cf11af4f55bd89d031bf;hpb=992b7ca8f4e58494b0bbc5ef7e228c65879ba0e8;p=flightgear.git diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx index 52eb06662..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 @@ -42,22 +46,28 @@ #include #include #include +#include +#include #include #include
#include
#include
-#include
-#include
+#include +#include +#include +#include #include + #ifdef _WIN32 # include -# if !defined(__MINGW32__) -# include -# include -# endif #endif + +#if defined(SG_MAC) +# include // for cocoaOpenUrl +#endif + #include "gui.h" using std::string; @@ -75,9 +85,6 @@ const __fg_gui_fn_t __fg_gui_fn[] = { {"dumpHiResSnapShot", fgHiResDumpWrapper}, #endif {"dumpSnapShot", fgDumpSnapShotWrapper}, -#if defined( _WIN32 ) && !defined(__MINGW32__) - {"printScreen", printScreen}, -#endif // Help {"helpCb", helpCb}, @@ -142,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 += ')'; @@ -157,50 +164,65 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable) the Gui callback functions ____________________________________________________________________*/ - -// Hier Neu :-) This is my newly added code -// Added by David Findlay -// on Sunday 3rd of December - - -void helpCb () +void helpCb() { - string command; - - SGPath path( globals->get_fg_root() ); - path.append( "Docs/index.html" ); - -#ifndef _WIN32 - - command = globals->get_browser(); - string::size_type pos; - if ((pos = command.find("%u", 0)) != string::npos) - command.replace(pos, 2, path.str()); - else - command += " " + path.str(); + openBrowser( "Docs/index.html" ); +} - command += " &"; - system( command.c_str() ); +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) + { + // resolve local file path + SGPath path(address); + path = globals->resolve_maybe_aircraft_path(address); + if (!path.isNull()) + address = path.str(); + else + { + mkDialog ("Sorry, file not found!"); + SG_LOG(SG_GENERAL, SG_ALERT, "openBrowser: Cannot find requested file '" + << address << "'."); + return false; + } + } -#else // _WIN32 +#ifdef SG_MAC + if (address.find("://")==string::npos) { + address = "file://" + address; + } + + cocoaOpenUrl(address); +#elif defined _WIN32 // Look for favorite browser - char Dummy[1024], ExecName[1024], browserParameter[1024]; char win32_name[1024]; # ifdef __CYGWIN__ - cygwin32_conv_to_full_win32_path(path.c_str(),win32_name); + cygwin32_conv_to_full_win32_path(address.c_str(),win32_name); # else - strncpy(win32_name,path.c_str(), 1024); + strncpy(win32_name,address.c_str(), 1024); # endif - Dummy[0] = 0; - FindExecutable(win32_name, Dummy, ExecName); - snprintf(browserParameter, 1024, "file:///%s", win32_name); - ShellExecute ( NULL, "open", ExecName, browserParameter, Dummy, + 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 ("Help started in your web browser window."); + + mkDialog("The file is shown in your web browser window."); + return ok; } #if defined( TR_HIRES_SNAP) @@ -212,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); @@ -327,7 +348,7 @@ void fgHiResDump() int curColumn = trGet(tr, TR_CURRENT_COLUMN); // int curRow = trGet(tr, TR_CURRENT_ROW); - renderer->update( false ); + renderer->update(); // OSGFIXME // if ( do_hud ) // fgUpdateHUD( curColumn*hud_col_step, curRow*hud_row_step, @@ -398,66 +419,11 @@ 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) - -#if defined( _WIN32 ) && !defined(__MINGW32__) - -void rotateView( double roll, double pitch, double yaw ) -{ - // rotate view -} - -GlBitmap *b1 = NULL; -GLubyte *hiResScreenCapture( int multiplier ) -{ - float oldfov = fgGetDouble("/sim/current-view/field-of-view"); - float fov = oldfov / multiplier; - FGViewer *v = globals->get_current_view(); - fgSetDouble("/sim/current-view/field-of-view", fov); -// globals->get_renderer()->init(); - int cur_width = fgGetInt("/sim/startup/xsize"); - int cur_height = fgGetInt("/sim/startup/ysize"); - delete( b1 ); - // New empty (mostly) bitmap - b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" ); - int x,y; - for ( y = 0; y < multiplier; y++ ) { - for ( x = 0; x < multiplier; x++ ) { - globals->get_renderer()->resize( cur_width, cur_height ); - // pan to tile - rotateView( 0, (y*fov)-((multiplier-1)*fov/2), (x*fov)-((multiplier-1)*fov/2) ); - globals->get_renderer()->update( false ); - // restore view - GlBitmap b2; - b1->copyBitmap( &b2, cur_width*x, cur_height*y ); - } - } - fgSetDouble("/sim/current-view/field-of-view", oldfov); - return b1->getBitmap(); -} -#endif - -#if defined( _WIN32 ) && !defined(__MINGW32__) -// win32 print screen function -void printScreen () { - int mouse = fgGetMouseCursor(); - fgSetMouseCursor(MOUSE_CURSOR_NONE); - - CGlPrinter p( CGlPrinter::PRINT_BITMAP ); - int cur_width = fgGetInt("/sim/startup/xsize"); - int cur_height = fgGetInt("/sim/startup/ysize"); - p.Begin( "FlightGear", cur_width*3, cur_height*3 ); - p.End( hiResScreenCapture(3) ); - - fgSetMouseCursor(mouse); -} -#endif // #ifdef _WIN32 - - void fgDumpSnapShotWrapper () { fgDumpSnapShot(); } @@ -467,68 +433,136 @@ void fgHiResDumpWrapper () { fgHiResDump(); } +namespace +{ + using namespace flightgear; + + 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: + + // start new snap shot + static bool start() + { + // allow only one snapshot at a time + if (_snapShotOp.valid()) + return false; + _snapShotOp = new GUISnapShotOperation(); + /* register with graphics context so actual snap shot is done + * in the graphics context (thread) */ + osg::Camera* guiCamera = getGUICamera(CameraGroup::getDefault()); + WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA(); + osg::GraphicsContext* gc = 0; + if (guiCamera) + gc = guiCamera->getGraphicsContext(); + if (gc) { + gc->add(_snapShotOp.get()); + } else { + wsa->windows[0]->gc->add(_snapShotOp.get()); + } + return true; + } -// do a screen snap shot -bool fgDumpSnapShot () { - static SGConstPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master"); + private: + // constructor to be executed in main loop's thread + GUISnapShotOperation() : + flightgear::GraphicsContextOperation(std::string("GUI snap shot")), + _master_freeze(fgGetNode("/sim/freeze/master", true)), + _freeze(_master_freeze->getBoolValue()), + _result(false), + _mouse(fgGetMouseCursor()) + { + if (!_freeze) + _master_freeze->setBoolValue(true); + + fgSetMouseCursor(MOUSE_CURSOR_NONE); + + string dir = fgGetString("/sim/paths/screenshot-dir"); + if (dir.empty()) + 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 = globals->get_fg_home(); + } - bool freeze = master_freeze->getBoolValue(); - if ( !freeze ) { - fgSetBool("/sim/freeze/master", true); - } + _path = nextScreenshotPath(dir); + _xsize = fgGetInt("/sim/startup/xsize"); + _ysize = fgGetInt("/sim/startup/ysize"); - int mouse = fgGetMouseCursor(); - fgSetMouseCursor(MOUSE_CURSOR_NONE); + FGRenderer *renderer = globals->get_renderer(); + renderer->resize(_xsize, _ysize); + globals->get_event_mgr()->addTask("SnapShotTimer", + this, &GUISnapShotOperation::timerExpired, + 0.1, false); + } - fgSetBool("/sim/signals/screenshot", true); + // to be executed in graphics context (maybe separate thread) + void run(osg::GraphicsContext* gc) + { + _result = sg_glDumpWindow(_path.c_str(), + _xsize, + _ysize); + } - FGRenderer *renderer = globals->get_renderer(); - renderer->resize( fgGetInt("/sim/startup/xsize"), - fgGetInt("/sim/startup/ysize") ); + // timer method, to be executed in main loop's thread + virtual void timerExpired() + { + if (isFinished()) + { + globals->get_event_mgr()->removeTask("SnapShotTimer"); - // 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"); - } + fgSetString("/sim/paths/screenshot-last", _path.c_str()); + fgSetBool("/sim/signals/screenshot", _result); - char filename[24]; - static int count = 1; - while (count < 1000) { - snprintf(filename, 24, "fgfs-screen-%03d.png", count++); + fgSetMouseCursor(_mouse); - SGPath p(dir); - p.append(filename); - if (!p.exists()) { - path.set(p.str()); - break; - } - } + if ( !_freeze ) + _master_freeze->setBoolValue(false); - int result = sg_glDumpWindow(path.c_str(), - fgGetInt("/sim/startup/xsize"), - fgGetInt("/sim/startup/ysize")); + _snapShotOp = 0; + } + } + + static osg::ref_ptr _snapShotOp; + SGPropertyNode_ptr _master_freeze; + bool _freeze; + bool _result; + int _mouse; + int _xsize, _ysize; + SGPath _path; + }; - fgSetString("/sim/paths/screenshot-last", path.c_str()); - fgSetBool("/sim/signals/screenshot", false); +} // of anonymous namespace - fgSetMouseCursor(mouse); +osg::ref_ptr GUISnapShotOperation::_snapShotOp; - if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); - } - return result != 0; +// do a screen snap shot +bool fgDumpSnapShot () +{ + // start snap shot operation, while needs to be executed in + // graphics context + return GUISnapShotOperation::start(); } // do an entire scenegraph dump @@ -538,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) { @@ -569,7 +602,7 @@ void fgDumpSceneGraph() delete [] filename; if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } @@ -581,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) { @@ -612,9 +644,22 @@ void fgDumpTerrainBranch() delete [] filename; if ( !freeze ) { - fgSetBool("/sim/freeze/master", false); + master_freeze->setBoolValue(false); } } - +void fgPrintVisibleSceneInfoCommand() +{ + SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master"); + bool freeze = master_freeze->getBoolValue(); + if ( !freeze ) { + master_freeze->setBoolValue(true); + } + + flightgear::printVisibleSceneInfo(globals->get_renderer()); + + if ( !freeze ) { + master_freeze->setBoolValue(false); + } +}