X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui_funcs.cxx;h=1b7acf2b27bfbf9ca89e9f0da3ff6032895d1953;hb=1ae2b59333dc914d10bcc726bc94e71cbf3e411e;hp=de40bda0e4f0a267b63e2f154b178bc83f392156;hpb=eccddb3dfd662ec6ac2af44f614439dfb8ab70c3;p=flightgear.git

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index de40bda0e..1b7acf2b2 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -32,48 +32,21 @@
 
 #include <simgear/compiler.h>
 
-#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 <sstream>
-
-#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 <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/fg_os.hxx>
 #include <Main/renderer.hxx>
 #include <Main/viewmgr.hxx>
 #include <GUI/new_gui.hxx>
@@ -82,11 +55,12 @@
 #  include <simgear/screen/win32-printer.h>
 #  include <simgear/screen/GlBitmaps.h>
 #endif
-
+#ifdef __MINGW32__
+#include <shellapi.h>
+#endif
 #include "gui.h"
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
+using std::string;
 
 
 #if defined( TR_HIRES_SNAP)
@@ -168,7 +142,7 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
     string msg = txt;
     msg += '\n';
     msg += throwable.getFormattedMessage();
-    if (!throwable.getOrigin().empty()) {
+    if (!std::strlen(throwable.getOrigin()) != 0) {
         msg += "\n (reported by ";
         msg += throwable.getOrigin();
         msg += ')';
@@ -193,15 +167,6 @@ 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" );
 	
@@ -243,7 +208,6 @@ 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;
@@ -257,11 +221,8 @@ void fgHiResDump()
     }
 
     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();
@@ -286,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;
     }
@@ -297,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;
@@ -323,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;
@@ -335,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);
@@ -347,7 +313,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);
@@ -359,7 +325,7 @@ 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 );
         // OSGFIXME
@@ -428,11 +394,7 @@ void fgHiResDump()
 
     delete [] filename;
 
-    if ( show_pu_cursor ) {
-        puShowCursor();
-    }
-
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
     fgSetBool("/sim/menubar/visibility", menu_status);
 
     if ( !freeze ) {
@@ -482,12 +444,8 @@ GLubyte *hiResScreenCapture( int multiplier )
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 // win32 print screen function
 void printScreen () {
-    bool show_pu_cursor = false;
-    TurnCursorOff();
-    if ( !puCursorIsHidden() ) {
-	show_pu_cursor = true;
-	puHideCursor();
-    }
+    int mouse = fgGetMouseCursor();
+    fgSetMouseCursor(MOUSE_CURSOR_NONE);
 
     CGlPrinter p( CGlPrinter::PRINT_BITMAP );
     int cur_width = fgGetInt("/sim/startup/xsize");
@@ -495,10 +453,7 @@ void printScreen () {
     p.Begin( "FlightGear", cur_width*3, cur_height*3 );
     p.End( hiResScreenCapture(3) );
 
-    if ( show_pu_cursor ) {
-	puShowCursor();
-    }
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
 }
 #endif // #ifdef WIN32
 
@@ -515,7 +470,6 @@ void fgHiResDumpWrapper () {
 
 // do a screen snap shot
 bool fgDumpSnapShot () {
-    bool show_pu_cursor = false;
     static SGConstPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master");
 
     bool freeze = master_freeze->getBoolValue();
@@ -523,11 +477,9 @@ bool fgDumpSnapShot () {
         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();
@@ -540,7 +492,10 @@ bool fgDumpSnapShot () {
     renderer->update( true );
     renderer->update( true );
 
-    string dir = fgGetString("/sim/paths/screenshot-dir", fgGetString("/sim/fg-current"));
+    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 '"
@@ -568,11 +523,7 @@ bool fgDumpSnapShot () {
     fgSetString("/sim/paths/screenshot-last", path.c_str());
     fgSetBool("/sim/signals/screenshot", false);
 
-    if ( show_pu_cursor ) {
-        puShowCursor();
-    }
-
-    TurnCursorOn();
+    fgSetMouseCursor(mouse);
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
@@ -587,8 +538,6 @@ void fgDumpSceneGraph()
     string message;
     static int count = 1;
 
-    FGRenderer *renderer = globals->get_renderer();
-
     static const SGPropertyNode *master_freeze
 	= fgGetNode("/sim/freeze/master");
 
@@ -632,8 +581,6 @@ void fgDumpTerrainBranch()
     string message;
     static int count = 1;
 
-    FGRenderer *renderer = globals->get_renderer();
-
     static const SGPropertyNode *master_freeze
 	= fgGetNode("/sim/freeze/master");