X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=5b943d662733386a7af74a89613f414216d1312c;hb=5cad5aa7da2476ca8323a61f81dea59676dca085;hp=2764dce3cae3a890d28c482856cd5704cc71b8c9;hpb=3ad6d87576f71ee1fa127a65a355f8d79f5e5fbd;p=flightgear.git

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 2764dce3c..5b943d662 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/
@@ -32,73 +32,36 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include SG_GL_H
-
-#if defined(FX) && defined(XMESA)
-#  include <GL/xmesa.h>
-#endif
-
-#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 <plib/ssg.h>
 
-#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
 
-#include <Include/general.hxx>
-#include <Aircraft/aircraft.hxx>
-#include <Airports/simple.hxx>
-#include <Autopilot/auto_gui.hxx>
 #include <Cockpit/panel.hxx>
-#include <Controls/controls.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/fg_os.hxx>
+#include <Main/renderer.hxx>
 #include <Main/viewmgr.hxx>
+#include <GUI/new_gui.hxx>
 
 #if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
 #  include <simgear/screen/win32-printer.h>
 #  include <simgear/screen/GlBitmaps.h>
 #endif
-
+#ifdef __MINGW32__
+#include <shellapi.h>
+#endif
 #include "gui.h"
-#include "gui_local.hxx"
-#include "preset_dlg.hxx"
-#include "prop_picker.hxx"
-#include "sgVec3Slider.hxx"
-
-SG_USING_STD(string);
-SG_USING_STD(cout);
 
-extern void fgHUDalphaAdjust( puObject * );
+using std::string;
 
-// from cockpit.cxx
-extern void fgLatLonFormatToggle( puObject *);
 
 #if defined( TR_HIRES_SNAP)
 #include <simgear/screen/tr.h>
@@ -106,37 +69,8 @@ extern void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
                          GLfloat x_end, GLfloat y_end );
 #endif
 
-puDialogBox  *dialogBox = 0;
-puFrame      *dialogFrame = 0;
-puText       *dialogBoxMessage = 0;
-puOneShot    *dialogBoxOkButton = 0;
-
-puDialogBox  *YNdialogBox = 0;
-puFrame      *YNdialogFrame = 0;
-puText       *YNdialogBoxMessage = 0;
-puOneShot    *YNdialogBoxOkButton = 0;
-puOneShot    *YNdialogBoxNoButton = 0;
-
-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"
-
-char msg_OK[]     = "OK";
-char msg_NO[]     = "NO";
-char msg_YES[]    = "YES";
-char msg_CANCEL[] = "Cancel";
-char msg_RESET[]  = "Reset";
-
-char global_dialog_string[256];
 
 const __fg_gui_fn_t __fg_gui_fn[] = {
-
-        // File
-        {"saveFlight", saveFlight},
-        {"loadFlight", loadFlight},
-        {"reInit", reInit},
 #ifdef TR_HIRES_SNAP
         {"dumpHiResSnapShot", fgHiResDumpWrapper},
 #endif
@@ -144,31 +78,6 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
         {"printScreen", printScreen},
 #endif
-        {"MayBeGoodBye", MayBeGoodBye},
-
-        //View
-        {"guiTogglePanel", guiTogglePanel},
-        {"PilotOffsetAdjust", PilotOffsetAdjust},
-        {"fgHUDalphaAdjust", fgHUDalphaAdjust},
-        {"prop_pickerView", prop_pickerView},
-
-        // Environment
-        {"fgPresetAirport", fgPresetAirport},
-        {"fgPresetRunway", fgPresetRunway},
-        {"fgPresetOffsetDistance", fgPresetOffsetDistance},
-        {"fgPresetAltitude", fgPresetAltitude},
-        {"fgPresetGlideslope", fgPresetGlideslope},
-        {"fgPresetAirspeed", fgPresetAirspeed},
-        {"fgPresetCommit", fgPresetCommit},
-
-        // Autopilot
-        {"NewAltitude", NewAltitude},
-	{"NewHeading", NewHeading},
-        {"AddWayPoint", AddWayPoint},
-        {"PopWayPoint", PopWayPoint},
-        {"ClearRoute", ClearRoute},
-        {"fgLatLonFormatToggle", fgLatLonFormatToggle},
-
         // Help
         {"helpCb", helpCb},
 
@@ -179,29 +88,52 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
 
 /* ================ General Purpose Functions ================ */
 
-void initDialog(void) {
-    // Initialize our GLOBAL GUI STRINGS
-    gui_msg_OK     = msg_OK;     // "OK"
-    gui_msg_NO     = msg_NO;     // "NO"
-    gui_msg_YES    = msg_YES;    // "YES"
-    gui_msg_CANCEL = msg_CANCEL; // "CANCEL"
-    gui_msg_RESET  = msg_RESET;  // "RESET"
-}
-
-// 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)
 {
-    strncpy(global_dialog_string, txt, 256);
-    dialogBoxMessage->setLabel(global_dialog_string);
-    FG_PUSH_PUI_DIALOG( dialogBox );
+    NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
+    if (!gui)
+        return;
+    SGPropertyNode *master = gui->getDialogProperties("message");
+    if (!master)
+        return;
+
+    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.
 void guiErrorMessage (const char *txt)
 {
     SG_LOG(SG_GENERAL, SG_ALERT, txt);
-    if (dialogBox != 0)
-      mkDialog(txt);
+    mkDialog(txt);
 }
 
 // Message Box to report a throwable (usually an exception).
@@ -210,20 +142,13 @@ 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);
-    if (dialogBox != 0)
-      mkDialog(msg.c_str());
-}
-
-// Intercept the Escape Key
-void ConfirmExitDialog(void)
-{
-    FG_PUSH_PUI_DIALOG( YNdialogBox );
+    mkDialog(msg.c_str());
 }
 
 
@@ -237,253 +162,23 @@ ____________________________________________________________________*/
 // Added by David Findlay <nedz@bigpond.com>
 // on Sunday 3rd of December
 
-// Start new Save Dialog Box
-puDialogBox     *SaveDialog = 0;
-puFrame         *SaveDialogFrame = 0;
-puText          *SaveDialogMessage = 0;
-puInput         *SaveDialogInput = 0;
-
-puOneShot       *SaveDialogOkButton = 0;
-puOneShot       *SaveDialogCancelButton = 0;
-// static puOneShot       *SaveDialogResetButton = 0;
-
-// Default save filename
-char saveFile[256] = "fgfs.sav";
-
-// Cancel Button
-void SaveDialogCancel(puObject *) {
-    FG_POP_PUI_DIALOG( SaveDialog );
-}
-
-// If press OK do this
-void SaveDialogOk(puObject*) {
-
-    FG_POP_PUI_DIALOG( SaveDialog );
-
-    char *s;
-    SaveDialogInput->getValue(&s);
-
-    ofstream output(s);
-    // cout << saveFile << endl;
-    if (output.good() && fgSaveFlight(output)) {
-	output.close();
-	mkDialog("Saved flight");
-	SG_LOG(SG_INPUT, SG_INFO, "Saved flight");
-    } else {
-	mkDialog("Cannot save flight");
-	SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight");
-    }
-}
-
-// Create Dialog
-void saveFlight(puObject *cv) {
-    SaveDialog = new puDialogBox (150, 50);
-    {
-        SaveDialogFrame   = new puFrame           (0,0,350, 150);
-        SaveDialogMessage
-            = new puText( (150 - puGetDefaultLabelFont().getStringWidth( "File Name:" ) / 2), 110 );
-        SaveDialogMessage ->    setLabel          ("File Name:");
-
-        SaveDialogInput   = new puInput           (50, 70, 300, 100);
-        SaveDialogInput   ->    setValue          (saveFile);
-        SaveDialogInput   ->    acceptInput();
-
-        SaveDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
-        SaveDialogOkButton     ->     setLegend   (gui_msg_OK);
-        SaveDialogOkButton     ->     setCallback ( SaveDialogOk );
-        SaveDialogOkButton     ->     makeReturnDefault(TRUE);
-
-        SaveDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
-        SaveDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
-        SaveDialogCancelButton ->     setCallback ( SaveDialogCancel );
-    }
-    FG_FINALIZE_PUI_DIALOG( SaveDialog );
-   
-    SaveDialog -> reveal();
-}
-
-// Load Dialog Start
-puDialogBox     *LoadDialog = 0;
-puFrame         *LoadDialogFrame = 0;
-puText          *LoadDialogMessage = 0;
-puInput         *LoadDialogInput = 0;
-
-puOneShot       *LoadDialogOkButton = 0;
-puOneShot       *LoadDialogCancelButton = 0;
-// static puOneShot       *LoadDialogResetButton = 0;
-
-// Default load filename
-char loadFile[256] = "fgfs.sav";
-
-// Do this if the person click okay
-void LoadDialogOk(puObject *) {
-
-    FG_POP_PUI_DIALOG( LoadDialog );
-
-    char *l;
-    LoadDialogInput->getValue(&l);
-
-    ifstream input(l);
-    if (input.good() && fgLoadFlight(input)) {
-	input.close();
-	mkDialog("Loaded flight");
-	SG_LOG(SG_INPUT, SG_INFO, "Restored flight");
-    } else {
-	mkDialog("Failed to load flight");
-	SG_LOG(SG_INPUT, SG_ALERT, "Cannot load flight");
-    }
-}
-
-// Do this if the person presses cancel
-void LoadDialogCancel(puObject *) {
-    FG_POP_PUI_DIALOG( LoadDialog );
-}
-
-// Create Load Dialog
-void loadFlight(puObject *cb)
-{
-    LoadDialog = new puDialogBox (150, 50);
-    {
-        LoadDialogFrame   = new puFrame           (0,0,350, 150);
-        LoadDialogMessage
-            = new puText( (150 - puGetDefaultLabelFont().getStringWidth( "File Name:" ) / 2), 110 );
-        LoadDialogMessage ->    setLabel          ("File Name:");
-
-        LoadDialogInput   = new puInput           (50, 70, 300, 100);
-        LoadDialogInput   ->    setValue          (loadFile);
-        LoadDialogInput   ->    acceptInput();
-
-        LoadDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
-        LoadDialogOkButton     ->     setLegend   (gui_msg_OK);
-        LoadDialogOkButton     ->     setCallback ( LoadDialogOk );
-        LoadDialogOkButton     ->     makeReturnDefault(TRUE);
-
-        LoadDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
-        LoadDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
-        LoadDialogCancelButton ->     setCallback ( LoadDialogCancel );
-    }
-    FG_FINALIZE_PUI_DIALOG( LoadDialog );
-   
-    LoadDialog -> reveal();
-}
-
-// This is the accessor function
-void guiTogglePanel(puObject *cb)
-{
-  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"));
-}
-
-void goodBye(puObject *)
-{
-    // SG_LOG( SG_INPUT, SG_ALERT,
-    //      "Program exiting normally at user request." );
-    cout << "Program exiting normally at user request." << endl;
-
-    exit(0);
-}
-
-
-void goAwayCb (puObject *me)
-{
-    FG_POP_PUI_DIALOG( dialogBox );
-}
-
-void mkDialogInit (void)
-{
-    //  printf("mkDialogInit\n");
-    int x = (fgGetInt("/sim/startup/xsize")/2 - 400/2);
-    int y = (fgGetInt("/sim/startup/ysize")/2 - 100/2);
-    dialogBox = new puDialogBox (x, y); // 150, 50
-    {
-        dialogFrame = new puFrame (0,0,400,100);
-        dialogBoxMessage  =  new puText         (10, 70);
-        dialogBoxMessage  -> setLabel           ("");
-        dialogBoxOkButton =  new puOneShot      (180, 10, 240, 50);
-        dialogBoxOkButton -> setLegend          (gui_msg_OK);
-        dialogBoxOkButton -> makeReturnDefault  (TRUE );
-        dialogBoxOkButton -> setCallback        (goAwayCb);
-    }
-    FG_FINALIZE_PUI_DIALOG( dialogBox );
-}
-
-void MayBeGoodBye(puObject *)
-{
-    ConfirmExitDialog(); 
-}
-
-void goAwayYesNoCb(puObject *me)
-{
-    FG_POP_PUI_DIALOG( YNdialogBox);
-}
-
-void ConfirmExitDialogInit(void)
-{
-    char msg[] = "Really Quit";
-    char *s;
-
-    //  printf("ConfirmExitDialogInit\n");
-    int len = 200 - puGetDefaultLabelFont().getStringWidth ( msg ) / 2;
-
-    int x = (fgGetInt("/sim/startup/xsize")/2 - 400/2);
-    int y = (fgGetInt("/sim/startup/ysize")/2 - 100/2);
-	
-    YNdialogBox = new puDialogBox (x, y); // 150, 50
-    {
-        YNdialogFrame = new puFrame (0,0,400, 100);
-        
-        YNdialogBoxMessage  =  new puText         (len, 70);
-        YNdialogBoxMessage  -> setDefaultValue    (msg);
-        YNdialogBoxMessage  -> getDefaultValue    (&s);
-        YNdialogBoxMessage  -> setLabel           (s);
-        
-        YNdialogBoxOkButton =  new puOneShot      (100, 10, 160, 50);
-        YNdialogBoxOkButton -> setLegend          (gui_msg_OK);
-        YNdialogBoxOkButton -> makeReturnDefault  (TRUE );
-        YNdialogBoxOkButton -> setCallback        (goodBye);
-        
-        YNdialogBoxNoButton =  new puOneShot      (240, 10, 300, 50);
-        YNdialogBoxNoButton -> setLegend          (gui_msg_NO);
-        YNdialogBoxNoButton -> setCallback        (goAwayYesNoCb);
-    }
-    FG_FINALIZE_PUI_DIALOG( YNdialogBox );
-}
 
-void notCb (puObject *)
-{
-    mkDialog ("This function isn't implemented yet");
-}
-
-void helpCb (puObject *)
+void helpCb ()
 {
     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");
+    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();
 
-    if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) {
-        command = help_app + " -remote \"openURL(" + path.str() + ")\"";
-    } else {
-        command = help_app + " " + path.str();
-    }
     command += " &";
     system( command.c_str() );
 
@@ -495,11 +190,11 @@ void helpCb (puObject *)
 # ifdef __CYGWIN__
     cygwin32_conv_to_full_win32_path(path.c_str(),win32_name);
 # else
-    strcpy(win32_name,path.c_str());
+    strncpy(win32_name,path.c_str(), 1024);
 # endif
     Dummy[0] = 0;
     FindExecutable(win32_name, Dummy, ExecName);
-    sprintf(browserParameter, "file:///%s", win32_name);
+    snprintf(browserParameter, 1024, "file:///%s", win32_name);
     ShellExecute ( NULL, "open", ExecName, browserParameter, Dummy,
                    SW_SHOWNORMAL ) ;
 
@@ -513,7 +208,7 @@ 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;
 
@@ -525,22 +220,20 @@ void fgHiResDump()
         fgSetBool("/sim/freeze/master", true);
     }
 
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
-    }
+    fgSetBool("/sim/menubar/visibility", false);
+    int mouse = fgGetMouseCursor();
+    fgSetMouseCursor(MOUSE_CURSOR_NONE);
 
     FGRenderer *renderer = globals->get_renderer();
-    renderer->init();
+//     renderer->init();
     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 );
+    //renderer->update( true );
+    //renderer->update( true );
 
     // This ImageSize stuff is a temporary hack
     // should probably use 128x128 tile size and
@@ -554,6 +247,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;
     }
@@ -565,6 +259,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;
@@ -574,11 +269,12 @@ void fgHiResDump()
     trTileBuffer(tr, GL_RGB, GL_UNSIGNED_BYTE, tile);
     trImageSize(tr, imageWidth, imageHeight);
     trRowOrder(tr, TR_TOP_TO_BOTTOM);
-    sgFrustum *frustum = ssgGetFrustum();
-    trFrustum(tr,
-              frustum->getLeft(), frustum->getRight(),
-              frustum->getBot(),  frustum->getTop(), 
-              frustum->getNear(), frustum->getFar());
+    // OSGFIXME
+//     sgFrustum *frustum = ssgGetFrustum();
+//     trFrustum(tr,
+//               frustum->getLeft(), frustum->getRight(),
+//               frustum->getBot(),  frustum->getTop(), 
+//               frustum->getNear(), frustum->getFar());
 	
     /* Prepare ppm output file */
     while (count < 1000) {
@@ -590,6 +286,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;
@@ -602,6 +299,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);
@@ -614,21 +313,30 @@ 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);
+    glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
+    glHint(GL_FOG_HINT, GL_NICEST);
 	
     /* Draw tiles */
     int more = 1;
     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 );
-        if ( do_hud )
-            fgUpdateHUD( curColumn*hud_col_step,      curRow*hud_row_step,
-                         (curColumn+1)*hud_col_step, (curRow+1)*hud_row_step );
-        if (do_panel)
-            globals->get_current_panel()->update(
-                                   curColumn*panel_col_step, panel_col_step,
-                                   curRow*panel_row_step,    panel_row_step );
+        // OSGFIXME
+//         if ( do_hud )
+//             fgUpdateHUD( curColumn*hud_col_step,      curRow*hud_row_step,
+//                          (curColumn+1)*hud_col_step, (curRow+1)*hud_row_step );
+        // OSGFIXME
+//         if (do_panel)
+//             globals->get_current_panel()->update(
+//                                    curColumn*panel_col_step, panel_col_step,
+//                                    curRow*panel_row_step,    panel_row_step );
         more = trEndTile(tr);
 
         /* save tile into tile row buffer*/
@@ -662,26 +370,32 @@ void fgHiResDump()
 
     trDelete(tr);
 
+    glHint(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE);
+    glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
+    glHint(GL_POINT_SMOOTH_HINT, GL_DONT_CARE);
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE);
+    if ( (!strcmp(fgGetString("/sim/rendering/fog"), "disabled")) ||
+         (!fgGetBool("/sim/rendering/shading"))) {
+        // if fastest fog requested, or if flat shading force fastest
+        glHint ( GL_FOG_HINT, GL_FASTEST );
+    } else if ( !strcmp(fgGetString("/sim/rendering/fog"), "nicest") ) {
+        glHint ( GL_FOG_HINT, GL_DONT_CARE );
+    }
+
     fclose(f);
 
-    message = "Snap shot saved to ";
+    message = "Snapshot saved to \"";
     message += filename;
+    message += "\".";
     mkDialog (message.c_str());
 
     free(tile);
     free(buffer);
 
-    //	message = "Snap shot saved to ";
-    //	message += filename;
-    //	mkDialog (message.c_str());
-
     delete [] filename;
 
-    if ( show_pu_cursor ) {
-        puShowCursor();
-    }
-
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
+    fgSetBool("/sim/menubar/visibility", menu_status);
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
@@ -704,10 +418,10 @@ GLubyte *hiResScreenCapture( int multiplier )
     float fov = oldfov / multiplier;
     FGViewer *v = globals->get_current_view();
     fgSetDouble("/sim/current-view/field-of-view", fov);
-    globals->get_renderer()->init();
+//     globals->get_renderer()->init();
     int cur_width = fgGetInt("/sim/startup/xsize");
     int cur_height = fgGetInt("/sim/startup/ysize");
-    if (b1) delete( b1 );
+    delete( b1 );
     // New empty (mostly) bitmap
     b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
     int x,y;
@@ -729,14 +443,9 @@ GLubyte *hiResScreenCapture( int multiplier )
 
 #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 );
+void printScreen () {
+    int mouse = fgGetMouseCursor();
+    fgSetMouseCursor(MOUSE_CURSOR_NONE);
 
     CGlPrinter p( CGlPrinter::PRINT_BITMAP );
     int cur_width = fgGetInt("/sim/startup/xsize");
@@ -744,50 +453,38 @@ void printScreen ( puObject *obj ) {
     p.Begin( "FlightGear", cur_width*3, cur_height*3 );
     p.End( hiResScreenCapture(3) );
 
-    // BusyCursor(1);
-    if ( show_pu_cursor ) {
-	puShowCursor();
-    }
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
 }
 #endif // #ifdef WIN32
 
 
-void fgDumpSnapShotWrapper ( puObject *obj ) {
+void fgDumpSnapShotWrapper () {
     fgDumpSnapShot();
 }
 
 
-void fgHiResDumpWrapper ( puObject *obj ) {
+void fgHiResDumpWrapper () {
     fgHiResDump();
 }
 
 
 // do a screen snap shot
-void fgDumpSnapShot () {
-    bool show_pu_cursor = false;
-    char *filename = new char [24];
-    string message;
-    static int count = 1;
-
-    static const SGPropertyNode *master_freeze
-	= fgGetNode("/sim/freeze/master");
+bool fgDumpSnapShot () {
+    static SGConstPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master");
 
     bool freeze = master_freeze->getBoolValue();
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", true);
     }
 
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
-    }
+    int mouse = fgGetMouseCursor();
+    fgSetMouseCursor(MOUSE_CURSOR_NONE);
+
+    fgSetBool("/sim/signals/screenshot", true);
 
     FGRenderer *renderer = globals->get_renderer();
-    renderer->init();
     renderer->resize( fgGetInt("/sim/startup/xsize"),
-                        fgGetInt("/sim/startup/ysize") );
+                      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
@@ -795,36 +492,129 @@ void fgDumpSnapShot () {
     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;
+        }
+    }
+
+    int 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 != 0;
+}
+
+// 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");
+
+    bool freeze = master_freeze->getBoolValue();
+    if ( !freeze ) {
+        fgSetBool("/sim/freeze/master", 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 = "Snap shot saved to ";
+    if ( fgDumpSceneGraphToFile(filename)) {
+	message = "Entire scene graph saved to \"";
 	message += filename;
+	message += "\".";
     } else {
-        message = "Failed to save to ";
+        message = "Failed to save to \"";
 	message += filename;
+	message += "\".";
     }
 
     mkDialog (message.c_str());
 
     delete [] filename;
 
-    if ( show_pu_cursor ) {
-	puShowCursor();
+    if ( !freeze ) {
+        fgSetBool("/sim/freeze/master", false);
+    }
+}
+
+    
+// do an terrain branch dump
+void fgDumpTerrainBranch()
+{
+    char *filename = new char [24];
+    string message;
+    static int count = 1;
+
+    static const SGPropertyNode *master_freeze
+	= fgGetNode("/sim/freeze/master");
+
+    bool freeze = master_freeze->getBoolValue();
+    if ( !freeze ) {
+        fgSetBool("/sim/freeze/master", true);
     }
 
-    TurnCursorOn();
+    while (count < 1000) {
+        FILE *fp;
+        snprintf(filename, 24, "fgfs-graph-%03d.osg", count++);
+        if ( (fp = fopen(filename, "r")) == NULL )
+            break;
+        fclose(fp);
+    }
+
+    if ( fgDumpTerrainBranchToFile(filename)) {
+	message = "Terrain graph saved to \"";
+	message += filename;
+	message += "\".";
+    } else {
+        message = "Failed to save to \"";
+	message += filename;
+	message += "\".";
+    }
+
+    mkDialog (message.c_str());
+
+    delete [] filename;
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
     }
 }
 
+    
+