X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=73fb6fd5e162f3a67862a8b88feafdd94c447986;hb=52e5a9abe83882ca946429f7d8e71894d5852d8f;hp=5bfe72297c472a70bdf65b3b7107a8d586a98077;hpb=794f5cc1542bba1128b8f2d6f8a260bf5b3771cd;p=flightgear.git

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 5bfe72297..73fb6fd5e 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -25,52 +25,74 @@
 #  include <config.h>
 #endif
 
-#if defined(__linux__) && defined(__i386__)
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#if defined(HAVE_FEENABLEEXCEPT)
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <fenv.h>
+#elif defined(__linux__) && defined(__i386__)
 #  include <fpu_control.h>
-#  include <signal.h>
-#elif defined(__FreeBSD__)
-#  include <signal.h>
+#endif
+
+#ifndef _WIN32
+#  include <unistd.h> // for gethostname()
 #endif
 
 #include <errno.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
-#include <simgear/debug/logstream.hxx>
 
-#include STL_IOSTREAM
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+#include <cstring>
+#include <iostream>
+using std::cerr;
+using std::endl;
 
+#include <Viewer/fgviewer.hxx>
 #include "main.hxx"
 #include "globals.hxx"
+#include "fg_props.hxx"
 
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#  include <pthread.h>
-#endif
-
 #include "fg_os.hxx"
 
-#ifdef macintosh
-#  include <console.h>		// -dw- for command line dialog
-#endif
-
-char *homedir = ::getenv( "HOME" );
-char *hostname = ::getenv( "HOSTNAME" );
-bool free_hostname = false;
+std::string homedir;
+std::string hostname;
 
-// foreward declaration.
+// forward declaration.
 void fgExitCleanup();
 
-#if defined(__linux__) && defined(__i386__)
+static bool fpeAbort = false;
+static void initFPE();
+
+#if defined(HAVE_FEENABLEEXCEPT)
+static void handleFPE(int);
+static void
+initFPE ()
+{
+    if (fpeAbort) {
+        int except = fegetexcept();
+        feenableexcept(except | FE_DIVBYZERO | FE_INVALID);
+    } else {
+        signal(SIGFPE, handleFPE);
+    }
+}
 
-static void handleFPE (int);
+static void handleFPE(int)
+{
+    feclearexcept(FE_ALL_EXCEPT);
+    signal(SIGFPE, handleFPE);
+}
+#elif defined(__linux__) && defined(__i386__)
 
+static void handleFPE(int);
 static void
 initFPE ()
 {
@@ -92,33 +114,17 @@ handleFPE (int num)
   initFPE();
   SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)");
 }
-#endif
-
-#ifdef __APPLE__
-
-typedef struct
+#else
+static void initFPE()
 {
-  int  lo;
-  int  hi;
-} PSN;
-
-extern "C" {
-  short CPSGetCurrentProcess(PSN *psn);
-  short CPSSetProcessName (PSN *psn, char *processname);
-  short CPSEnableForegroundOperation(PSN *psn, int _arg2, int _arg3, int _arg4, int _arg5);
-  short CPSSetFrontProcess(PSN *psn);
-};
-
-#define CPSEnableFG(psn) CPSEnableForegroundOperation(psn,0x03,0x3C,0x2C,0x1103)
-
+}
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(_WIN32)
 int main ( int argc, char **argv );
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                              LPSTR lpCmdLine, int nCmdShow) {
 
-  logbuf::has_no_console();
   main( __argc, __argv );
 }
 #endif
@@ -144,7 +150,7 @@ void flush_fpe(void)
 }
 #endif
 
-static void terminate() {
+static void fg_terminate() {
     cerr << endl <<
             "Uncaught Exception: you should see a meaningful error message\n"
             "here, but your GLUT (or SDL) library was apparently compiled\n"
@@ -157,7 +163,23 @@ static void terminate() {
 int _bootstrap_OSInit;
 
 // Main entry point; catch any exceptions that have made it this far.
-int main ( int argc, char **argv ) {
+int main ( int argc, char **argv )
+{
+#if defined(_MSC_VER) || defined(_WIN32) 
+  // Don't show blocking "no disk in drive" error messages on Windows 7,
+  // silently return errors to application instead.
+  // See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX"
+  SetErrorMode(SEM_NOOPENFILEERRORBOX);
+
+  hostname = ::getenv( "COMPUTERNAME" );
+#else
+  // Unix(alike) systems
+  char _hostname[256];
+  gethostname(_hostname, 256);
+  hostname = _hostname;
+    
+  signal(SIGPIPE, SIG_IGN);
+#endif
 
 #ifdef PTW32_STATIC_LIB
     // Initialise static pthread win32 lib
@@ -165,12 +187,18 @@ int main ( int argc, char **argv ) {
 #endif
     _bootstrap_OSInit = 0;
 
-#if defined(__linux__) && defined(__i386__)
-    // Enable floating-point exceptions for Linux/x86
-    initFPE();
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
     // Ignore floating-point exceptions on FreeBSD
-    signal(SIGFPE, SIG_IGN);
+    signal(SIGFPE, SIG_IGN); 
+#else
+    // Maybe Enable floating-point exceptions on Linux
+    for (int i = 0; i < argc; ++i) {
+        if (!strcmp("--enable-fpe", argv[i])) {
+            fpeAbort = true;
+            break;
+        }
+    }
+    initFPE();
 #endif
 
 #if defined(sgi)
@@ -196,41 +224,42 @@ int main ( int argc, char **argv ) {
 #if defined( HAVE_BC5PLUS )
     _control87(MCW_EM, MCW_EM);  /* defined in float.h */
 #endif
-
-    // Keyboard focus hack
-#if defined(__APPLE__) && !defined(OSX_BUNDLE)
-    {
-      PSN psn;
-
-      fgOSInit (&argc, argv);
-      _bootstrap_OSInit++;
-
-      CPSGetCurrentProcess(&psn);
-      CPSSetProcessName(&psn, "FlightGear");
-      CPSEnableFG(&psn);
-      CPSSetFrontProcess(&psn);
+  
+    bool fgviewer = false;
+    for (int i = 0; i < argc; ++i) {
+        if (!strcmp("--fgviewer", argv[i])) {
+            fgviewer = true;
+            break;
+        }
     }
-#endif
 
     // FIXME: add other, more specific
     // exceptions.
     try {
-        std::set_terminate(terminate);
+        std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
-        fgMainInit(argc, argv);
+        if (fgviewer)
+            fgviewerMain(argc, argv);
+        else
+            fgMainInit(argc, argv);
+            
+        
     } catch (const sg_throwable &t) {
                             // We must use cerr rather than
                             // logging, since logging may be
                             // disabled.
         cerr << "Fatal error: " << t.getFormattedMessage() << endl;
-        if (!t.getOrigin().empty())
+        if (std::strlen(t.getOrigin()) != 0)
             cerr << " (received from " << t.getOrigin() << ')' << endl;
 
-    } catch (const string &s) {
-        cerr << "Fatal error: " << s << endl;
+    } catch (const std::exception &e ) {
+        cerr << "Fatal error (std::exception): " << e.what() << endl;
+
+    } catch (const std::string &s) {
+        cerr << "Fatal error (std::string): " << s << endl;
 
     } catch (const char *s) {
-        cerr << "Fatal error: " << s << endl;
+        cerr << "Fatal error (const char*): " << s << endl;
 
     } catch (...) {
         cerr << "Unknown exception in the main loop. Aborting..." << endl;
@@ -241,16 +270,13 @@ int main ( int argc, char **argv ) {
     return 0;
 }
 
-// do some clean up on exit.  Specifically we want to call alutExit()
-// which happens in the sound manager destructor.
+// do some clean up on exit.  Specifically we want to delete the sound-manager,
+// so OpenAL device and context are released cleanly
 void fgExitCleanup() {
 
     if (_bootstrap_OSInit != 0)
         fgSetMouseCursor(MOUSE_CURSOR_POINTER);
 
     delete globals;
-
-    if (free_hostname && hostname != NULL)
-        free(hostname);
 }