Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index f6696081cc5fc46d59205e82ebc84a75b764b980..734f998c0978fde2e8954ea7bacdad2a1d92225c 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -27,12 +27,10 @@
 
 #if defined(__linux__) && defined(__i386__)
 #  include <fpu_control.h>
-#  include <signal.h>
-#elif defined(__FreeBSD__)
-#  include <signal.h>
 #endif
 
 #include <errno.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -40,25 +38,16 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
-#include STL_IOSTREAM
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+#include <iostream>
+using std::cerr;
+using std::endl;
 
 #include "main.hxx"
 #include "globals.hxx"
 
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.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;
@@ -93,30 +82,12 @@ handleFPE (int num)
 }
 #endif
 
-#ifdef __APPLE__
-
-typedef struct
-{
-  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
 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
@@ -142,11 +113,25 @@ void flush_fpe(void)
 }
 #endif
 
+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"
+            "and/or linked without exception support. Please complain to\n"
+            "its provider!"
+            << endl << endl;
+    abort();
+}
+
 int _bootstrap_OSInit;
 
 // Main entry point; catch any exceptions that have made it this far.
 int main ( int argc, char **argv ) {
 
+#ifdef PTW32_STATIC_LIB
+    // Initialise static pthread win32 lib
+    pthread_win32_process_attach_np ();
+#endif
     _bootstrap_OSInit = 0;
 
 #if defined(__linux__) && defined(__i386__)
@@ -156,6 +141,9 @@ int main ( int argc, char **argv ) {
     // Ignore floating-point exceptions on FreeBSD
     signal(SIGFPE, SIG_IGN);
 #endif
+#if !defined( _MSC_VER ) && !defined( __MINGW32__ )
+    signal(SIGPIPE, SIG_IGN);
+#endif
 
 #if defined(sgi)
     flush_fpe();
@@ -181,24 +169,10 @@ int main ( int argc, char **argv ) {
     _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);
-    }
-#endif
-
     // FIXME: add other, more specific
     // exceptions.
     try {
+        std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
         fgMainInit(argc, argv);
     } catch (const sg_throwable &t) {
@@ -212,6 +186,9 @@ int main ( int argc, char **argv ) {
     } catch (const string &s) {
         cerr << "Fatal error: " << s << endl;
 
+    } catch (const char *s) {
+        cerr << "Fatal error: " << s << endl;
+
     } catch (...) {
         cerr << "Unknown exception in the main loop. Aborting..." << endl;
         if (errno)