X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=a839ae6f2052a4d6a4cba7ba2449fd5e9da8b257;hb=846fd2169832c8938f04386139de746a06e80d4b;hp=3a338a77d4e0f82c2cae482f478b9344b5d8f2c0;hpb=284c73a95ce2d799ba5075cccac2e948817a6968;p=flightgear.git

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 3a338a77d..a839ae6f2 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -30,68 +30,47 @@
 #  include <config.h>
 #endif
 
-#include <simgear/compiler.h>
-
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
-#  include <windows.h>
+#include <windows.h>
 #endif
 
-#include SG_GL_H
-
-#if defined(FX) && defined(XMESA)
-#  include <GL/xmesa.h>
-#endif
+#include <simgear/compiler.h>
 
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
+#include <cstring>
+#include <sstream>
 
 #include <stdlib.h>
-#include <string.h>
-
-// for help call back
-#ifdef WIN32
-# include <shellapi.h>
-# ifdef __CYGWIN__
-#  include <sys/cygwin.h>
-# endif
-#endif
 
-#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
+#include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props_io.hxx>
 
-#include <Include/general.hxx>
-#include <Aircraft/aircraft.hxx>
-#include <Aircraft/controls.hxx>
-#include <Airports/simple.hxx>
 #include <Cockpit/panel.hxx>
-#include <FDM/flight.hxx>
-#include <Main/main.hxx>
-#include <Main/fg_init.hxx>
-#include <Main/fg_io.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewmgr.hxx>
+#include <Main/fg_os.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/CameraGroup.hxx>
 #include <GUI/new_gui.hxx>
 
-#if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
-#  include <simgear/screen/win32-printer.h>
-#  include <simgear/screen/GlBitmaps.h>
+
+#ifdef _WIN32
+#  include <shellapi.h>
+#endif
+
+#if defined(SG_MAC)
+# include <GUI/CocoaHelpers.h> // for cocoaOpenUrl
 #endif
 
 #include "gui.h"
-#include "gui_local.hxx"
-#include "preset_dlg.hxx"
-#include "sgVec3Slider.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
+using std::string;
 
 
 #if defined( TR_HIRES_SNAP)
@@ -101,38 +80,11 @@ extern void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
 #endif
 
 
-// TODO: remove after the last hardcoded dialog has died
-char *gui_msg_OK     = "OK";
-char *gui_msg_NO     = "NO";
-char *gui_msg_YES    = "YES";
-char *gui_msg_CANCEL = "CANCEL";
-char *gui_msg_RESET  = "RESET";
-
-
 const __fg_gui_fn_t __fg_gui_fn[] = {
-
-        // File
-        {"reInit", reInit},
 #ifdef TR_HIRES_SNAP
         {"dumpHiResSnapShot", fgHiResDumpWrapper},
 #endif
         {"dumpSnapShot", fgDumpSnapShotWrapper},
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-        {"printScreen", printScreen},
-#endif
-
-        //View
-        {"guiTogglePanel", guiTogglePanel},
-
-        // Environment
-        {"fgPresetAirport", fgPresetAirport},
-        {"fgPresetRunway", fgPresetRunway},
-        {"fgPresetOffsetDistance", fgPresetOffsetDistance},
-        {"fgPresetAltitude", fgPresetAltitude},
-        {"fgPresetGlideslope", fgPresetGlideslope},
-        {"fgPresetAirspeed", fgPresetAirspeed},
-        {"fgPresetCommit", fgPresetCommit},
-
         // Help
         {"helpCb", helpCb},
 
@@ -143,19 +95,45 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
 
 /* ================ General Purpose Functions ================ */
 
-// General Purpose Message Box
+// General Purpose Message Box. Makes sure no more than 5 different
+// messages are displayed at the same time, and none of them are
+// duplicates. (5 is a *lot*, but this will hardly ever be reached
+// and we don't want to miss any, either.)
 void mkDialog (const char *txt)
 {
     NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
     if (!gui)
         return;
-    SGPropertyNode_ptr dlg = gui->getDialogProperties("message");
-    if (!dlg)
+    SGPropertyNode *master = gui->getDialogProperties("message");
+    if (!master)
         return;
 
-    dlg->setStringValue("text/label", txt);
-    dlg->setStringValue("button/legend", "OK");
-    gui->showDialog("message");
+    const int maxdialogs = 5;
+    string name;
+    SGPropertyNode *msg = fgGetNode("/sim/gui/dialogs", true);
+    int i;
+    for (i = 0; i < maxdialogs; i++) {
+        std::ostringstream s;
+        s << "message-" << i;
+        name = s.str();
+
+        if (!msg->getNode(name.c_str(), false))
+            break;
+
+        if (!strcmp(txt, msg->getNode(name.c_str())->getStringValue("message"))) {
+            SG_LOG(SG_GENERAL, SG_WARN, "mkDialog(): duplicate of message " << txt);
+            return;
+        }
+    }
+    if (i == maxdialogs)
+        return;
+    msg = msg->getNode(name.c_str(), true);
+    msg->setStringValue("message", txt);
+    msg = msg->getNode("dialog", true);
+    copyProperties(master, msg);
+    msg->setStringValue("name", name.c_str());
+    gui->newDialog(msg);
+    gui->showDialog(name.c_str());
 }
 
 // Message Box to report an error.
@@ -171,10 +149,10 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
     string msg = txt;
     msg += '\n';
     msg += throwable.getFormattedMessage();
-    if (!throwable.getOrigin().empty()) {
-      msg += "\n (reported by ";
-      msg += throwable.getOrigin();
-      msg += ')';
+    if (std::strlen(throwable.getOrigin()) != 0) {
+        msg += "\n (reported by ";
+        msg += throwable.getOrigin();
+        msg += ')';
     }
     SG_LOG(SG_GENERAL, SG_ALERT, msg);
     mkDialog(msg.c_str());
@@ -186,71 +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 <nedz@bigpond.com>
-// on Sunday 3rd of December
-
-
-// This is the accessor function
-void guiTogglePanel(puObject *cb)
+void helpCb()
 {
-  if (fgGetBool("/sim/panel/visibility"))
-    fgSetBool("/sim/panel/visibility", false);
-  else
-    fgSetBool("/sim/panel/visibility", true);
-
-  globals->get_renderer()->resize(fgGetInt("/sim/startup/xsize"),
-                                  fgGetInt("/sim/startup/ysize"));
+    openBrowser( "Docs/index.html" );
 }
 
-void helpCb (puObject *)
+bool openBrowser(const std::string& aAddress)
 {
-    string command;
-	
-#if defined(FX) && !defined(WIN32)
-#  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
-    if ( globals->get_fullscreen() ) {
-        globals->set_fullscreen(false);
-        XMesaSetFXmode( XMESA_FX_WINDOW );
-    }
-#  endif
-#endif
-	
-    SGPath path( globals->get_fg_root() );
-    path.append( "Docs/index.html" );
-	
-#if !defined(WIN32)
-
-    string help_app = fgGetString("/sim/startup/browser-app");
-
-    if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) {
-        command = help_app + " -remote \"openURL(" + path.str() + ")\"";
-    } else {
-        command = help_app + " " + path.str();
+    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;
+        }
     }
-    command += " &";
-    system( command.c_str() );
 
-#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)
@@ -258,25 +230,20 @@ void fgHiResDump()
 {
     FILE *f;
     string message;
-    bool show_pu_cursor = false;
     bool menu_status = fgGetBool("/sim/menubar/visibility");
     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);
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
-    }
+    int mouse = fgGetMouseCursor();
+    fgSetMouseCursor(MOUSE_CURSOR_NONE);
 
     FGRenderer *renderer = globals->get_renderer();
 //     renderer->init();
@@ -301,6 +268,7 @@ void fgHiResDump()
     /* allocate buffer large enough to store one tile */
     GLubyte *tile = (GLubyte *)malloc(width * height * 3 * sizeof(GLubyte));
     if (!tile) {
+        delete [] filename;
         printf("Malloc of tile buffer failed!\n");
         return;
     }
@@ -312,6 +280,7 @@ void fgHiResDump()
     GLubyte *buffer
         = (GLubyte *)malloc(imageWidth * height * 3 * sizeof(GLubyte));
     if (!buffer) {
+        delete [] filename;
         free(tile);
         printf("Malloc of tile row buffer failed!\n");
         return;
@@ -338,6 +307,7 @@ void fgHiResDump()
     f = fopen(filename, "wb");
     if (!f) {
         printf("Couldn't open image file: %s\n", filename);
+        delete [] filename;
         free(buffer);
         free(tile);
         return;
@@ -350,6 +320,8 @@ void fgHiResDump()
     /* just to be safe... */
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
+    // OSGFIXME
+#if 0
     /* Because the HUD and Panel change the ViewPort we will
      * need to handle some lowlevel stuff ourselves */
     int ncols = trGet(tr, TR_COLUMNS);
@@ -362,7 +334,7 @@ void fgHiResDump()
     bool do_panel = fgPanelVisible();
     GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
     GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
-
+#endif
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
     glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
     glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
@@ -374,9 +346,9 @@ void fgHiResDump()
     while (more) {
         trBeginTile(tr);
         int curColumn = trGet(tr, TR_CURRENT_COLUMN);
-        int curRow =  trGet(tr, TR_CURRENT_ROW);
+        // 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,
@@ -443,138 +415,222 @@ void fgHiResDump()
 
     delete [] filename;
 
-    if ( show_pu_cursor ) {
-        puShowCursor();
-    }
-
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
     fgSetBool("/sim/menubar/visibility", menu_status);
 
     if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", false);
+        master_freeze->setBoolValue(false);
     }
 }
 #endif // #if defined( TR_HIRES_SNAP)
 
+void fgDumpSnapShotWrapper () {
+    fgDumpSnapShot();
+}
 
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 
-void rotateView( double roll, double pitch, double yaw )
-{
-	// rotate view
+void fgHiResDumpWrapper () {
+    fgHiResDump();
 }
 
-GlBitmap *b1 = NULL;
-GLubyte *hiResScreenCapture( int multiplier )
+namespace
 {
-    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 );
-	}
+    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();
     }
-    fgSetDouble("/sim/current-view/field-of-view", oldfov);
-    return b1->getBitmap();
-}
-#endif
+    
+    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;
+        }
 
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-// win32 print screen function
-void printScreen ( puObject *obj ) {
-    bool show_pu_cursor = false;
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
-    }
-    // BusyCursor( 0 );
+    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();
+            }
 
-    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) );
+            _path = nextScreenshotPath(dir);
+            _xsize = fgGetInt("/sim/startup/xsize");
+            _ysize = fgGetInt("/sim/startup/ysize");
 
-    // BusyCursor(1);
-    if ( show_pu_cursor ) {
-	puShowCursor();
-    }
-    TurnCursorOn();
-}
-#endif // #ifdef WIN32
+            FGRenderer *renderer = globals->get_renderer();
+            renderer->resize(_xsize, _ysize);
+            globals->get_event_mgr()->addTask("SnapShotTimer",
+                    this, &GUISnapShotOperation::timerExpired,
+                    0.1, false);
+        }
 
+        // to be executed in graphics context (maybe separate thread)
+        void run(osg::GraphicsContext* gc)
+        {
+            _result = sg_glDumpWindow(_path.c_str(),
+                                     _xsize,
+                                     _ysize);
+        }
 
-void fgDumpSnapShotWrapper ( puObject *obj ) {
-    fgDumpSnapShot();
-}
+        // timer method, to be executed in main loop's thread
+        virtual void timerExpired()
+        {
+            if (isFinished())
+            {
+                globals->get_event_mgr()->removeTask("SnapShotTimer");
 
+                fgSetString("/sim/paths/screenshot-last", _path.c_str());
+                fgSetBool("/sim/signals/screenshot", _result);
 
-void fgHiResDumpWrapper ( puObject *obj ) {
-    fgHiResDump();
-}
+                fgSetMouseCursor(_mouse);
 
+                if ( !_freeze )
+                    _master_freeze->setBoolValue(false);
+
+                _snapShotOp = 0;
+            }
+        }
+    
+        static osg::ref_ptr<GUISnapShotOperation> _snapShotOp;
+        SGPropertyNode_ptr _master_freeze;
+        bool _freeze;
+        bool _result;
+        int _mouse;
+        int _xsize, _ysize;
+        SGPath _path;
+    };
+
+} // of anonymous namespace
+
+osg::ref_ptr<GUISnapShotOperation> GUISnapShotOperation::_snapShotOp;
 
 // do a screen snap shot
-void fgDumpSnapShot () {
-    bool show_pu_cursor = false;
+bool fgDumpSnapShot ()
+{
+    // start snap shot operation, while needs to be executed in
+    // graphics context
+    return GUISnapShotOperation::start();
+}
+
+// do an entire scenegraph dump
+void fgDumpSceneGraph()
+{
     char *filename = new char [24];
     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);
     }
 
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
+    while (count < 1000) {
+        FILE *fp;
+        snprintf(filename, 24, "fgfs-graph-%03d.osg", count++);
+        if ( (fp = fopen(filename, "r")) == NULL )
+            break;
+        fclose(fp);
     }
-    fgSetBool("/sim/signals/screenshot", true);
 
-    FGRenderer *renderer = globals->get_renderer();
-//     renderer->init();
-    renderer->resize( fgGetInt("/sim/startup/xsize"),
-                        fgGetInt("/sim/startup/ysize") );
+    if ( fgDumpSceneGraphToFile(filename)) {
+	message = "Entire scene graph saved to \"";
+	message += filename;
+	message += "\".";
+    } else {
+        message = "Failed to save to \"";
+	message += filename;
+	message += "\".";
+    }
 
-    // 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 );
+    mkDialog (message.c_str());
+
+    delete [] filename;
+
+    if ( !freeze ) {
+        master_freeze->setBoolValue(false);
+    }
+}
+
+    
+// do an terrain branch dump
+void fgDumpTerrainBranch()
+{
+    char *filename = new char [24];
+    string message;
+    static int count = 1;
+
+    SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
+
+    bool freeze = master_freeze->getBoolValue();
+    if ( !freeze ) {
+        master_freeze->setBoolValue(true);
+    }
 
     while (count < 1000) {
         FILE *fp;
-        snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++);
+        snprintf(filename, 24, "fgfs-graph-%03d.osg", count++);
         if ( (fp = fopen(filename, "r")) == NULL )
             break;
         fclose(fp);
     }
 
-    if ( sg_glDumpWindow( filename,
-			  fgGetInt("/sim/startup/xsize"), 
-			  fgGetInt("/sim/startup/ysize")) ) {
-	message = "Snapshot saved to \"";
+    if ( fgDumpTerrainBranchToFile(filename)) {
+	message = "Terrain graph saved to \"";
 	message += filename;
 	message += "\".";
     } else {
@@ -583,19 +639,27 @@ void fgDumpSnapShot () {
 	message += "\".";
     }
 
-    fgSetBool("/sim/signals/screenshot", false);
     mkDialog (message.c_str());
 
     delete [] filename;
 
-    if ( show_pu_cursor ) {
-	puShowCursor();
+    if ( !freeze ) {
+        master_freeze->setBoolValue(false);
     }
+}
 
-    TurnCursorOn();
+void fgPrintVisibleSceneInfoCommand()
+{
+    SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
 
+    bool freeze = master_freeze->getBoolValue();
     if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", false);
+        master_freeze->setBoolValue(true);
     }
-}
 
+    flightgear::printVisibleSceneInfo(globals->get_renderer());
+
+    if ( !freeze ) {
+        master_freeze->setBoolValue(false);
+    }
+}