]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/fg_init.cxx
Crash-fix: mat-lib is now reference-counted.
[flightgear.git] / src / Main / fg_init.cxx
index ea323425c8819741c7c690a6888f7986f579bbb2..3abb334601472843151010de39fdc7721254706f 100644 (file)
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()
 
-#if defined( unix ) || defined( __CYGWIN__ )
-#  include <unistd.h>           // for gethostname()
-#endif
-#ifdef _WIN32
-#  include <direct.h>           // for getcwd()
-#  define getcwd _getcwd
+#if defined(SG_WINDOWS)
 #  include <io.h>               // isatty()
+#  include <process.h>          // _getpid()
+#  include <Windows.h>
 #  define isatty _isatty
-#  include "winsock2.h"                // for gethostname()
-#endif
-
-// work around a stdc++ lib bug in some versions of linux, but doesn't
-// seem to hurt to have this here for all versions of Linux.
-#ifdef linux
-#  define _G_NO_EXTERN_TEMPLATES
+#else
+// for open() and options
+#  include <sys/types.h>        
+#  include <sys/stat.h>
+#  include <fcntl.h>
 #endif
 
-#include <simgear/compiler.h>
-
 #include <string>
+
 #include <boost/algorithm/string/compare.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <osgViewer/Viewer>
+
+#include <simgear/canvas/Canvas.hxx>
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/props/props_io.hxx>
+#include <simgear/scene/tsync/terrasync.hxx>
 
-#include <simgear/misc/interpolator.hxx>
+#include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/material/matlib.hxx>
+#include <simgear/scene/material/Effect.hxx>
 #include <simgear/scene/model/particles.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/scene/tsync/terrasync.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Aircraft/replay.hxx>
-#include <Airports/apt_loader.hxx>
+#include <Aircraft/FlightHistory.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 
 #include <AIModel/AIManager.hxx>
 
-#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/ATISmgr.hxx>
 #include <ATC/atc_mgr.hxx>
 
 #include <Autopilot/route_mgr.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
 
+#include <Canvas/canvas_mgr.hxx>
+#include <Canvas/gui_mgr.hxx>
+#include <Canvas/FGCanvasSystemAdapter.hxx>
 #include <GUI/new_gui.hxx>
+#include <GUI/MessageBox.hxx>
 #include <Input/input.hxx>
 #include <Instrumentation/instrument_mgr.hxx>
 #include <Model/acmodel.hxx>
 #include <AIModel/AIManager.hxx>
 #include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
-#include <Navaids/fix.hxx>
-#include <Navaids/fixlist.hxx>
-#include <Navaids/airways.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Scripting/NasalSys.hxx>
 #include <Sound/voice.hxx>
+#include <Sound/soundmanager.hxx>
 #include <Systems/system_mgr.hxx>
 #include <Time/light.hxx>
+#include <Time/TimeManager.hxx>
+
 #include <Traffic/TrafficMgr.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>
 #include <FDM/fdm_shell.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <Viewer/renderer.hxx>
 #include <Viewer/viewmgr.hxx>
+#include <Viewer/FGEventHandler.hxx>
+#include <Navaids/NavDataCache.hxx>
+#include <Instrumentation/HUD/HUD.hxx>
+#include <Cockpit/cockpitDisplayManager.hxx>
+#include <Network/HTTPClient.hxx>
+#include <Network/fgcom.hxx>
+
+#include <Viewer/CameraGroup.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
 #include "fg_commands.hxx"
 #include "fg_props.hxx"
+#include "FGInterpolator.hxx"
 #include "options.hxx"
 #include "globals.hxx"
 #include "logger.hxx"
 #include "main.hxx"
+#include "positioninit.hxx"
+#include "util.hxx"
+#include "AircraftDirVisitorBase.hxx"
+
+#if defined(SG_MAC)
+#include <GUI/CocoaHelpers.h> // for Mac impl of platformDefaultDataPath()
+#endif
 
+//#define NEW_RESET 1
 
 using std::string;
+using std::endl;
+using std::cerr;
+using std::cout;
 using namespace boost::algorithm;
 
+extern osg::ref_ptr<osgViewer::Viewer> viewer;
 
 // Return the current base package version
 string fgBasePackageVersion() {
     SGPath base_path( globals->get_fg_root() );
     base_path.append("version");
-
+    if (!base_path.exists()) {
+        return string();
+    }
+    
     sg_gzifstream in( base_path.str() );
-    if ( !in.is_open() ) {
-        SGPath old_path( globals->get_fg_root() );
-        old_path.append( "Thanks" );
-        sg_gzifstream old( old_path.str() );
-        if ( !old.is_open() ) {
-            return "[none]";
-        } else {
-            return "[old version]";
-        }
+    if (!in.is_open()) {
+        return string();
     }
 
     string version;
@@ -149,68 +171,7 @@ string fgBasePackageVersion() {
     return version;
 }
 
-
-template <class T>
-bool fgFindAircraftInDir(const SGPath& dirPath, T* obj, bool (T::*pred)(const SGPath& p))
-{
-  if (!dirPath.exists()) {
-    SG_LOG(SG_GENERAL, SG_WARN, "fgFindAircraftInDir: no such path:" << dirPath.str());
-    return false;
-  }
-    
-  bool recurse = true;
-  simgear::Dir dir(dirPath);
-  simgear::PathList setFiles(dir.children(simgear::Dir::TYPE_FILE, "-set.xml"));
-  simgear::PathList::iterator p;
-  for (p = setFiles.begin(); p != setFiles.end(); ++p) {
-    // check file name ends with -set.xml
-    
-    // if we found a -set.xml at this level, don't recurse any deeper
-    recurse = false;
-    
-    bool done = (obj->*pred)(*p);
-    if (done) {
-      return true;
-    }
-  } // of -set.xml iteration
-  
-  if (!recurse) {
-    return false;
-  }
-  
-  simgear::PathList subdirs(dir.children(simgear::Dir::TYPE_DIR | simgear::Dir::NO_DOT_OR_DOTDOT));
-  for (p = subdirs.begin(); p != subdirs.end(); ++p) {
-    if (p->file() == "CVS") {
-      continue;
-    }
-    
-    if (fgFindAircraftInDir(*p, obj, pred)) {
-      return true;
-    }
-  } // of subdirs iteration
-  
-  return false;
-}
-
-template <class T>
-void fgFindAircraft(T* obj, bool (T::*pred)(const SGPath& p))
-{
-  const string_list& paths(globals->get_aircraft_paths());
-  string_list::const_iterator it = paths.begin();
-  for (; it != paths.end(); ++it) {
-    bool done = fgFindAircraftInDir(SGPath(*it), obj, pred);
-    if (done) {
-      return;
-    }
-  } // of aircraft paths iteration
-  
-  // if we reach this point, search the default location (always last)
-  SGPath rootAircraft(globals->get_fg_root());
-  rootAircraft.append("Aircraft");
-  fgFindAircraftInDir(rootAircraft, obj, pred);
-}
-
-class FindAndCacheAircraft
+class FindAndCacheAircraft : public AircraftDirVistorBase
 {
 public:
   FindAndCacheAircraft(SGPropertyNode* autoSave)
@@ -222,6 +183,7 @@ public:
   {
     std::string aircraft = fgGetString( "/sim/aircraft", "");
     if (aircraft.empty()) {
+        flightgear::fatalMessageBox("No aircraft", "No aircraft was specified");
       SG_LOG(SG_GENERAL, SG_ALERT, "no aircraft specified");
       return false;
     }
@@ -239,6 +201,9 @@ public:
           readProperties(setFile.str(), globals->get_props());
         } catch ( const sg_exception &e ) {
           SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+            flightgear::fatalMessageBox("Error reading aircraft",
+                                        "An error occured reading the requested aircraft (" + aircraft + ")",
+                                        e.getFormattedMessage());
           return false;
         }
         
@@ -246,6 +211,9 @@ public:
       } else {
         SG_LOG(SG_GENERAL, SG_ALERT, "aircraft '" << _searchAircraft << 
                "' not found in specified dir:" << aircraftDir);
+          flightgear::fatalMessageBox("Aircraft not found",
+                                      "The requested aircraft '" + aircraft + "' could not be found in the specified location.",
+                                      aircraftDir);
         return false;
       }
     }
@@ -260,11 +228,14 @@ public:
       n->setAttribute(SGPropertyNode::USERARCHIVE, true);
       _cache->removeChildren("aircraft");
   
-      fgFindAircraft(this, &FindAndCacheAircraft::checkAircraft);
+        visitAircraftPaths();
     }
     
     if (_foundPath.str().empty()) {
       SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find specified aircraft: " << aircraft );
+        flightgear::fatalMessageBox("Aircraft not found",
+                                    "The requested aircraft '" + aircraft + "' could not be found in any of the search paths");
+
       return false;
     }
     
@@ -279,6 +250,9 @@ public:
       readProperties(_foundPath.str(), globals->get_props());
     } catch ( const sg_exception &e ) {
       SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+        flightgear::fatalMessageBox("Error reading aircraft",
+                                    "An error occured reading the requested aircraft (" + aircraft + ")",
+                                    e.getFormattedMessage());
       return false;
     }
     
@@ -330,7 +304,7 @@ private:
     return false;
   }
   
-  bool checkAircraft(const SGPath& p)
+  virtual VisitResult visit(const SGPath& p)
   {
     // create cache node
     int i = 0;
@@ -352,10 +326,10 @@ private:
 
     if ( boost::equals(fileName, _searchAircraft.c_str(), is_iequal()) ) {
         _foundPath = p;
-        return true;
+        return VISIT_DONE;
     }
 
-    return false;
+    return VISIT_CONTINUE;
   }
   
   std::string _searchAircraft;
@@ -371,642 +345,185 @@ static SGPath platformDefaultDataPath()
   config.append( "flightgear.org" );
   return config;
 }
-#elif __APPLE__
 
-#include <CoreServices/CoreServices.h>
+#elif defined(SG_MAC)
+
+// platformDefaultDataPath defined in GUI/CocoaHelpers.h
 
-static SGPath platformDefaultDataPath()
-{
-  FSRef ref;
-  OSErr err = FSFindFolder(kUserDomain, kApplicationSupportFolderType, false, &ref);
-  if (err) {
-    return SGPath();
-  }
-  
-  unsigned char path[1024];
-  if (FSRefMakePath(&ref, path, 1024) != noErr) {
-    return SGPath();
-  }
-  
-  SGPath appData;
-  appData.set((const char*) path);
-  appData.append("FlightGear");
-  return appData;
-}
 #else
 static SGPath platformDefaultDataPath()
 {
-  SGPath config( homedir );
-  config.append( ".fgfs" );
-  return config;
+  return SGPath::home() / ".fgfs";
 }
 #endif
 
-// Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv )
+bool fgInitHome()
 {
-    SGPath dataPath = platformDefaultDataPath();
+  SGPath dataPath = SGPath::fromEnv("FG_HOME", platformDefaultDataPath());
+  globals->set_fg_home(dataPath.c_str());
     
-    const char *fg_home = getenv("FG_HOME");
-    if (fg_home)
-      dataPath = fg_home;
+    simgear::Dir fgHome(dataPath);
+    if (!fgHome.exists()) {
+        fgHome.create(0755);
+    }
     
-    simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
-    if (!exportDir.exists()) {
-      exportDir.create(0777);
+    if (!fgHome.exists()) {
+        flightgear::fatalMessageBox("Problem setting up user data",
+                                    "Unable to create the user-data storage folder at: '"
+                                    + dataPath.str() + "'");
+        return false;
     }
     
-    // Set /sim/fg-home and don't allow malign code to override it until
-    // Nasal security is set up.  Use FG_HOME if necessary.
-    SGPropertyNode *home = fgGetNode("/sim", true);
-    home->removeChild("fg-home", 0, false);
-    home = home->getChild("fg-home", 0, true);
-    home->setStringValue(dataPath.c_str());
-    home->setAttribute(SGPropertyNode::WRITE, false);
-  
-    flightgear::Options::sharedInstance()->init(argc, argv, dataPath);
-  
-    // Read global preferences from $FG_ROOT/preferences.xml
-    SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
-    fgLoadProps("preferences.xml", globals->get_props());
-    SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
-
-    globals->loadUserSettings(dataPath);
-
-    // Scan user config files and command line for a specified aircraft.
-    flightgear::Options::sharedInstance()->initAircraft();
-
-    FindAndCacheAircraft f(globals->get_props());
-    if (!f.loadAircraft()) {
-      return false;
+    if (fgGetBool("/sim/fghome-readonly", false)) {
+        // user / config forced us into readonly mode, fine
+        SG_LOG(SG_GENERAL, SG_INFO, "Running with FG_HOME readonly");
+        return true;
     }
-
-    // parse options after loading aircraft to ensure any user
-    // overrides of defaults are honored.
-    flightgear::Options::sharedInstance()->processOptions();
-      
-    return true;
-}
-
-// Set current tower position lon/lat given an airport id
-static bool fgSetTowerPosFromAirportID( const string& id) {
-    const FGAirport *a = fgFindAirportID( id);
-    if (a) {
-        SGGeod tower = a->getTowerLocation();
-        fgSetDouble("/sim/tower/longitude-deg",  tower.getLongitudeDeg());
-        fgSetDouble("/sim/tower/latitude-deg",  tower.getLatitudeDeg());
-        fgSetDouble("/sim/tower/altitude-ft", tower.getElevationFt());
+    
+// write our PID, and check writeability
+    SGPath pidPath(dataPath, "fgfs.pid");
+    if (pidPath.exists()) {
+        SG_LOG(SG_GENERAL, SG_INFO, "flightgear instance already running, switching to FG_HOME read-only.");
+        // set a marker property so terrasync/navcache don't try to write
+        // from secondary instances
+        fgSetBool("/sim/fghome-readonly", true);
         return true;
-    } else {
-        return false;
     }
-
-}
-
-struct FGTowerLocationListener : SGPropertyChangeListener {
-    void valueChanged(SGPropertyNode* node) {
-        string id(node->getStringValue());
-        if (fgGetBool("/sim/tower/auto-position",true))
-        {
-            // enforce using closest airport when auto-positioning is enabled 
-            const char* closest_airport = fgGetString("/sim/airport/closest-airport-id", "");
-            if (closest_airport && (id != closest_airport))
-            {
-                id = closest_airport;
-                node->setStringValue(id);
-            }
-        }
-        fgSetTowerPosFromAirportID(id);
+    
+    char buf[16];
+    bool result = false;
+#if defined(SG_WINDOWS)
+    size_t len = snprintf(buf, 16, "%d", _getpid());
+
+    HANDLE f = CreateFileA(pidPath.c_str(), GENERIC_READ | GENERIC_WRITE, 
+                                                  FILE_SHARE_READ, /* sharing */
+                           NULL, /* security attributes */
+                           CREATE_NEW, /* error if already exists */
+                           FILE_FLAG_DELETE_ON_CLOSE,
+                                                  NULL /* template */);
+    
+    result = (f != INVALID_HANDLE_VALUE);
+    if (result) {
+               DWORD written;
+        WriteFile(f, buf, len, &written, NULL /* overlapped */);
     }
-};
-
-struct FGClosestTowerLocationListener : SGPropertyChangeListener
-{
-    void valueChanged(SGPropertyNode* )
-    {
-        // closest airport has changed
-        if (fgGetBool("/sim/tower/auto-position",true))
-        {
-            // update tower position
-            const char* id = fgGetString("/sim/airport/closest-airport-id", "");
-            if (id && *id!=0)
-                fgSetString("/sim/tower/airport-id", id);
-        }
+#else
+    // POSIX, do open+unlink trick to the file is deleted on exit, even if we
+    // crash or exit(-1)
+    ssize_t len = snprintf(buf, 16, "%d", getpid());
+    int fd = ::open(pidPath.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);
+    if (fd >= 0) {
+        result = ::write(fd, buf, len) == len;
+        if( ::unlink(pidPath.c_str()) != 0 ) // delete file when app quits
+          result = false;
     }
-};
+#endif
 
-void fgInitTowerLocationListener() {
-    fgGetNode("/sim/tower/airport-id",  true)
-        ->addChangeListener( new FGTowerLocationListener(), true );
-    FGClosestTowerLocationListener* ntcl = new FGClosestTowerLocationListener();
-    fgGetNode("/sim/airport/closest-airport-id", true)
-        ->addChangeListener(ntcl , true );
-    fgGetNode("/sim/tower/auto-position", true)
-           ->addChangeListener(ntcl, true );
-}
+    fgSetBool("/sim/fghome-readonly", false);
 
-static void fgApplyStartOffset(const SGGeod& aStartPos, double aHeading, double aTargetHeading = HUGE_VAL)
-{
-  SGGeod startPos(aStartPos);
-  if (aTargetHeading == HUGE_VAL) {
-    aTargetHeading = aHeading;
-  }
-  
-  if ( fabs( fgGetDouble("/sim/presets/offset-distance-nm") ) > SG_EPSILON ) {
-    double offsetDistance = fgGetDouble("/sim/presets/offset-distance-nm");
-    offsetDistance *= SG_NM_TO_METER;
-    double offsetAzimuth = aHeading;
-    if ( fabs(fgGetDouble("/sim/presets/offset-azimuth-deg")) > SG_EPSILON ) {
-      offsetAzimuth = fgGetDouble("/sim/presets/offset-azimuth-deg");
-      aHeading = aTargetHeading;
+    if (!result) {
+        flightgear::fatalMessageBox("File permissions problem",
+                                    "Can't write to user-data storage folder, check file permissions and FG_HOME.",
+                                    "User-data at:" + dataPath.str());
     }
-
-    SGGeod offset;
-    double az2; // dummy
-    SGGeodesy::direct(startPos, offsetAzimuth + 180, offsetDistance, offset, az2);
-    startPos = offset;
-  }
-
-  // presets
-  fgSetDouble("/sim/presets/longitude-deg", startPos.getLongitudeDeg() );
-  fgSetDouble("/sim/presets/latitude-deg", startPos.getLatitudeDeg() );
-  fgSetDouble("/sim/presets/heading-deg", aHeading );
-
-  // other code depends on the actual values being set ...
-  fgSetDouble("/position/longitude-deg",  startPos.getLongitudeDeg() );
-  fgSetDouble("/position/latitude-deg",  startPos.getLatitudeDeg() );
-  fgSetDouble("/orientation/heading-deg", aHeading );
+    return result;
 }
 
-// Set current_options lon/lat given an airport id and heading (degrees)
-bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
-    if ( id.empty() )
-        return false;
-
-    // set initial position from runway and heading
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Attempting to set starting position from airport code "
-            << id << " heading " << tgt_hdg );
-
-    const FGAirport* apt = fgFindAirportID(id);
-    if (!apt) return false;
-    FGRunway* r = apt->findBestRunwayForHeading(tgt_hdg);
-    fgSetString("/sim/atc/runway", r->ident().c_str());
-
-    SGGeod startPos = r->pointOnCenterline(fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
-         fgApplyStartOffset(startPos, r->headingDeg(), tgt_hdg);
-    return true;
-}
-
-// Set current_options lon/lat given an airport id and parkig position name
-static bool fgSetPosFromAirportIDandParkpos( const string& id, const string& parkpos ) {
-    if ( id.empty() )
-        return false;
-
-    // can't see an easy way around this const_cast at the moment
-    FGAirport* apt = const_cast<FGAirport*>(fgFindAirportID(id));
-    if (!apt) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport " << id );
-        return false;
-    }
-    FGAirportDynamics* dcs = apt->getDynamics();
-    if (!dcs) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Airport " << id << "does not appear to have parking information available");
-        return false;
-    }
+// Read in configuration (file and command line)
+int fgInitConfig ( int argc, char **argv, bool reinit )
+{
+    SGPath dataPath = globals->get_fg_home();
     
-    int park_index = dcs->getNrOfParkings() - 1;
-    bool succes;
-    double radius = fgGetDouble("/sim/dimensions/radius-m");
-    if ((parkpos == string("AVAILABLE")) && (radius > 0)) {
-        double lat, lon, heading;
-        string fltType;
-        string acOperator;
-        SGPath acData;
-        try {
-            acData = fgGetString("/sim/fg-home");
-            acData.append("aircraft-data");
-            string acfile = fgGetString("/sim/aircraft") + string(".xml");
-            acData.append(acfile);
-            SGPropertyNode root;
-            readProperties(acData.str(), &root);
-            SGPropertyNode * node = root.getNode("sim");
-            fltType    = node->getStringValue("aircraft-class", "NONE"     );
-            acOperator = node->getStringValue("aircraft-operator", "NONE"     );
-        } catch (const sg_exception &) {
-            SG_LOG(SG_GENERAL, SG_INFO,
-                "Could not load aircraft aircrat type and operator information from: " << acData.str() << ". Using defaults");
-
-       // cout << path.str() << endl;
-        }
-        if (fltType.empty() || fltType == "NONE") {
-            SG_LOG(SG_GENERAL, SG_INFO,
-                "Aircraft type information not found in: " << acData.str() << ". Using default value");
-                fltType = fgGetString("/sim/aircraft-class"   );
-        }
-        if (acOperator.empty() || fltType == "NONE") {
-            SG_LOG(SG_GENERAL, SG_INFO,
-                "Aircraft operator information not found in: " << acData.str() << ". Using default value");
-                acOperator = fgGetString("/sim/aircraft-operator"   );
-        }
-
-        cerr << "Running aircraft " << fltType << " of livery " << acOperator << endl;
-        string acType; // Currently not used by findAvailable parking, so safe to leave empty. 
-        succes = dcs->getAvailableParking(&lat, &lon, &heading, &park_index, radius, fltType, acType, acOperator);
-        if (succes) {
-            fgGetString("/sim/presets/parkpos");
-            fgSetString("/sim/presets/parkpos", dcs->getParking(park_index)->getName());
-        } else {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find a suitable parking at airport " << id );
-            return false;
-        }
-    } else {
-        //cerr << "We shouldn't get here when AVAILABLE" << endl;
-        while (park_index >= 0 && dcs->getParkingName(park_index) != parkpos) park_index--;
-        if (park_index < 0) {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find parking position " << parkpos <<
-                    " at airport " << id );
-            return false;
-        }
-    }
-    FGParking* parking = dcs->getParking(park_index);
-    parking->setAvailable(false);
-    fgApplyStartOffset(
-      SGGeod::fromDeg(parking->getLongitude(), parking->getLatitude()),
-      parking->getHeading());
-    return true;
-}
-
-
-// Set current_options lon/lat given an airport id and runway number
-static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy, bool rwy_req ) {
-    if ( id.empty() )
-        return false;
-
-    // set initial position from airport and runway number
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Attempting to set starting position for "
-            << id << ":" << rwy );
-
-    const FGAirport* apt = fgFindAirportID(id);
-    if (!apt) {
-      SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport:" << id);
-      return false;
+    simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
+    if (!exportDir.exists()) {
+      exportDir.create(0755);
     }
     
-    if (!apt->hasRunwayWithIdent(rwy)) {
-      SG_LOG( SG_GENERAL, rwy_req ? SG_ALERT : SG_INFO,
-                "Failed to find runway " << rwy <<
-                " at airport " << id << ". Using default runway." );
-      return false;
+    // Set /sim/fg-home and don't allow malign code to override it until
+    // Nasal security is set up.  Use FG_HOME if necessary.
+    SGPropertyNode *home = fgGetNode("/sim", true);
+    home->removeChild("fg-home", 0, false);
+    home = home->getChild("fg-home", 0, true);
+    home->setStringValue(dataPath.c_str());
+    home->setAttribute(SGPropertyNode::WRITE, false);
+  
+    fgSetDefaults();
+    flightgear::Options* options = flightgear::Options::sharedInstance();
+    if (!reinit) {
+        options->init(argc, argv, dataPath);
     }
     
-    FGRunway* r(apt->getRunwayByIdent(rwy));
-    fgSetString("/sim/atc/runway", r->ident().c_str());
-    SGGeod startPos = r->pointOnCenterline( fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
-         fgApplyStartOffset(startPos, r->headingDeg());
-    return true;
-}
-
-
-static void fgSetDistOrAltFromGlideSlope() {
-    // cout << "fgSetDistOrAltFromGlideSlope()" << endl;
-    string apt_id = fgGetString("/sim/presets/airport-id");
-    double gs = fgGetDouble("/sim/presets/glideslope-deg")
-        * SG_DEGREES_TO_RADIANS ;
-    double od = fgGetDouble("/sim/presets/offset-distance-nm");
-    double alt = fgGetDouble("/sim/presets/altitude-ft");
-
-    double apt_elev = 0.0;
-    if ( ! apt_id.empty() ) {
-        apt_elev = fgGetAirportElev( apt_id );
-        if ( apt_elev < -9990.0 ) {
-            apt_elev = 0.0;
-        }
+    bool loadDefaults = options->shouldLoadDefaultConfig();
+    if (loadDefaults) {
+      // Read global preferences from $FG_ROOT/preferences.xml
+      SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
+      fgLoadProps("preferences.xml", globals->get_props());
+      SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
+        
+      // do not load user settings when reset to default is requested, or if
+      // told to explicitly ignore
+      if (options->isOptionSet("restore-defaults") || options->isOptionSet("ignore-autosave"))
+      {
+          SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
+      }
+      else
+      {
+          globals->loadUserSettings(dataPath);
+      }
     } else {
-        apt_elev = 0.0;
-    }
-
-    if( fabs(gs) > 0.01 && fabs(od) > 0.1 && alt < -9990 ) {
-        // set altitude from glideslope and offset-distance
-        od *= SG_NM_TO_METER * SG_METER_TO_FEET;
-        alt = fabs(od*tan(gs)) + apt_elev;
-        fgSetDouble("/sim/presets/altitude-ft", alt);
-        fgSetBool("/sim/presets/onground", false);
-        SG_LOG( SG_GENERAL, SG_INFO, "Calculated altitude as: "
-                << alt  << " ft" );
-    } else if( fabs(gs) > 0.01 && alt > 0 && fabs(od) < 0.1) {
-        // set offset-distance from glideslope and altitude
-        od  = (alt - apt_elev) / tan(gs);
-        od *= -1*SG_FEET_TO_METER * SG_METER_TO_NM;
-        fgSetDouble("/sim/presets/offset-distance-nm", od);
-        fgSetBool("/sim/presets/onground", false);
-        SG_LOG( SG_GENERAL, SG_INFO, "Calculated offset distance as: " 
-                << od  << " nm" );
-    } else if( fabs(gs) > 0.01 ) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Glideslope given but not altitude or offset-distance." );
-        SG_LOG( SG_GENERAL, SG_ALERT, "Resetting glideslope to zero" );
-        fgSetDouble("/sim/presets/glideslope-deg", 0);
-        fgSetBool("/sim/presets/onground", true);
-    }
+      SG_LOG(SG_GENERAL, SG_INFO, "not reading default configuration files");
+    }// of no-default-config selected
+    
+    return flightgear::FG_OPTIONS_OK;
 }
 
-
-// Set current_options lon/lat given an airport id and heading (degrees)
-static bool fgSetPosFromNAV( const string& id, const double& freq, FGPositioned::Type type ) {
-
-    const nav_list_type navlist
-        = globals->get_navlist()->findByIdentAndFreq( id.c_str(), freq, type );
-
-    if (navlist.size() == 0 ) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
-            << id << ":" << freq );
-        return false;
-    }
-
-    if( navlist.size() > 1 ) {
-        ostringstream buf;
-        buf << "Ambigous NAV-ID: '" << id << "'. Specify id and frequency. Available stations:" << endl;
-        for( nav_list_type::const_iterator it = navlist.begin(); it != navlist.end(); ++it ) {
-            // NDB stored in kHz, VOR stored in MHz * 100 :-P
-            double factor = (*it)->type() == FGPositioned::NDB ? 1.0 : 1/100.0;
-            string unit = (*it)->type() == FGPositioned::NDB ? "kHz" : "MHz";
-            buf << (*it)->ident() << " "
-                << setprecision(5) << (double)((*it)->get_freq() * factor) << " "
-                << (*it)->get_lat() << "/" << (*it)->get_lon()
-                << endl;
-        }
-
-        SG_LOG( SG_GENERAL, SG_ALERT, buf.str() );
-        return false;
+int fgInitAircraft(bool reinit)
+{
+    // Scan user config files and command line for a specified aircraft.
+    if (!reinit) {
+        flightgear::Options::sharedInstance()->initAircraft();
     }
-
-    FGNavRecord *nav = navlist[0];
-    fgApplyStartOffset(nav->geod(), fgGetDouble("/sim/presets/heading-deg"));
-    return true;
-}
-
-// Set current_options lon/lat given an aircraft carrier id
-static bool fgSetPosFromCarrier( const string& carrier, const string& posid ) {
-
-    // set initial position from runway and heading
-    SGGeod geodPos;
-    double heading;
-    SGVec3d uvw;
-    if (FGAIManager::getStartPosition(carrier, posid, geodPos, heading, uvw)) {
-        double lon = geodPos.getLongitudeDeg();
-        double lat = geodPos.getLatitudeDeg();
-        double alt = geodPos.getElevationFt();
-
-        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
-                << carrier << " at lat = " << lat << ", lon = " << lon
-                << ", alt = " << alt << ", heading = " << heading);
-
-        fgSetDouble("/sim/presets/longitude-deg",  lon);
-        fgSetDouble("/sim/presets/latitude-deg",  lat);
-        fgSetDouble("/sim/presets/altitude-ft", alt);
-        fgSetDouble("/sim/presets/heading-deg", heading);
-        fgSetDouble("/position/longitude-deg",  lon);
-        fgSetDouble("/position/latitude-deg",  lat);
-        fgSetDouble("/position/altitude-ft", alt);
-        fgSetDouble("/orientation/heading-deg", heading);
-
-        fgSetString("/sim/presets/speed-set", "UVW");
-        fgSetDouble("/velocities/uBody-fps", uvw(0));
-        fgSetDouble("/velocities/vBody-fps", uvw(1));
-        fgSetDouble("/velocities/wBody-fps", uvw(2));
-        fgSetDouble("/sim/presets/uBody-fps", uvw(0));
-        fgSetDouble("/sim/presets/vBody-fps", uvw(1));
-        fgSetDouble("/sim/presets/wBody-fps", uvw(2));
-
-        fgSetBool("/sim/presets/onground", true);
-
-        return true;
-    } else {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate aircraft carrier = "
-                << carrier );
-        return false;
+    
+    FindAndCacheAircraft f(globals->get_props());
+    if (!f.loadAircraft()) {
+        return flightgear::FG_OPTIONS_ERROR;
     }
-}
-// Set current_options lon/lat given an airport id and heading (degrees)
-static bool fgSetPosFromFix( const string& id )
-{
-  FGPositioned::TypeFilter fixFilter(FGPositioned::FIX);
-  FGPositioned* fix = FGPositioned::findNextWithPartialId(NULL, id, &fixFilter);
-  if (!fix) {
-    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate fix = " << id );
-    return false;
-  }
-  
-  fgApplyStartOffset(fix->geod(), fgGetDouble("/sim/presets/heading-deg"));
-  return true;
+    
+    return flightgear::FG_OPTIONS_OK;
 }
 
 /**
  * Initialize vor/ndb/ils/fix list management and query systems (as
  * well as simple airport db list)
+ * This is called multiple times in the case of a cache rebuild,
+ * to allow lengthy caching to take place in the background, without
+ * blocking the main/UI thread.
  */
 bool
 fgInitNav ()
 {
-    SG_LOG(SG_GENERAL, SG_INFO, "Loading Airport Database ...");
-
-    SGPath aptdb( globals->get_fg_root() );
-    aptdb.append( "Airports/apt.dat" );
-
-    SGPath p_metar( globals->get_fg_root() );
-    p_metar.append( "Airports/metar.dat" );
-
-    fgAirportDBLoad( aptdb.str(), p_metar.str() );
-    
-    FGNavList *navlist = new FGNavList;
-    FGNavList *loclist = new FGNavList;
-    FGNavList *gslist = new FGNavList;
-    FGNavList *dmelist = new FGNavList;
-    FGNavList *tacanlist = new FGNavList;
-    FGNavList *carrierlist = new FGNavList;
-    FGTACANList *channellist = new FGTACANList;
-
-    globals->set_navlist( navlist );
-    globals->set_loclist( loclist );
-    globals->set_gslist( gslist );
-    globals->set_dmelist( dmelist );
-    globals->set_tacanlist( tacanlist );
-    globals->set_carrierlist( carrierlist );
-    globals->set_channellist( channellist );
-
-    if ( !fgNavDBInit(navlist, loclist, gslist, dmelist, tacanlist, carrierlist, channellist) ) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Problems loading one or more navigational database" );
-    }
-    
-    SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
-    SGPath p_fix( globals->get_fg_root() );
-    p_fix.append( "Navaids/fix.dat" );
-    FGFixList fixlist;
-    fixlist.init( p_fix );  // adds fixes to the DB in positioned.cxx
-
-    SG_LOG(SG_GENERAL, SG_INFO, "  Airways");
-    flightgear::Airway::load();
-    
-    return true;
-}
-
-
-// Set the initial position based on presets (or defaults)
-bool fgInitPosition() {
-    // cout << "fgInitPosition()" << endl;
-    double gs = fgGetDouble("/sim/presets/glideslope-deg")
-        * SG_DEGREES_TO_RADIANS ;
-    double od = fgGetDouble("/sim/presets/offset-distance-nm");
-    double alt = fgGetDouble("/sim/presets/altitude-ft");
-
-    bool set_pos = false;
-
-    // If glideslope is specified, then calculate offset-distance or
-    // altitude relative to glide slope if either of those was not
-    // specified.
-    if ( fabs( gs ) > 0.01 ) {
-        fgSetDistOrAltFromGlideSlope();
-    }
-
-
-    // If we have an explicit, in-range lon/lat, don't change it, just use it.
-    // If not, check for an airport-id and use that.
-    // If not, default to the middle of the KSFO field.
-    // The default values for lon/lat are deliberately out of range
-    // so that the airport-id can take effect; valid lon/lat will
-    // override airport-id, however.
-    double lon_deg = fgGetDouble("/sim/presets/longitude-deg");
-    double lat_deg = fgGetDouble("/sim/presets/latitude-deg");
-    if ( lon_deg >= -180.0 && lon_deg <= 180.0
-         && lat_deg >= -90.0 && lat_deg <= 90.0 )
-    {
-        set_pos = true;
-    }
-
-    string apt = fgGetString("/sim/presets/airport-id");
-    string rwy_no = fgGetString("/sim/presets/runway");
-    bool rwy_req = fgGetBool("/sim/presets/runway-requested");
-    string vor = fgGetString("/sim/presets/vor-id");
-    double vor_freq = fgGetDouble("/sim/presets/vor-freq");
-    string ndb = fgGetString("/sim/presets/ndb-id");
-    double ndb_freq = fgGetDouble("/sim/presets/ndb-freq");
-    string carrier = fgGetString("/sim/presets/carrier");
-    string parkpos = fgGetString("/sim/presets/parkpos");
-    string fix = fgGetString("/sim/presets/fix");
-    SGPropertyNode *hdg_preset = fgGetNode("/sim/presets/heading-deg", true);
-    double hdg = hdg_preset->getDoubleValue();
-
-    // save some start parameters, so that we can later say what the
-    // user really requested. TODO generalize that and move it to options.cxx
-    static bool start_options_saved = false;
-    if (!start_options_saved) {
-        start_options_saved = true;
-        SGPropertyNode *opt = fgGetNode("/sim/startup/options", true);
-
-        opt->setDoubleValue("latitude-deg", lat_deg);
-        opt->setDoubleValue("longitude-deg", lon_deg);
-        opt->setDoubleValue("heading-deg", hdg);
-        opt->setStringValue("airport", apt.c_str());
-        opt->setStringValue("runway", rwy_no.c_str());
-    }
-
-    if (hdg > 9990.0)
-        hdg = fgGetDouble("/environment/config/boundary/entry/wind-from-heading-deg", 270);
-
-    if ( !set_pos && !apt.empty() && !parkpos.empty() ) {
-        // An airport + parking position is requested
-        if ( fgSetPosFromAirportIDandParkpos( apt, parkpos ) ) {
-            // set tower position
-            fgSetString("/sim/airport/closest-airport-id",  apt.c_str());
-            fgSetString("/sim/tower/airport-id",  apt.c_str());
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos && !apt.empty() && !rwy_no.empty() ) {
-        // An airport + runway is requested
-        if ( fgSetPosFromAirportIDandRwy( apt, rwy_no, rwy_req ) ) {
-            // set tower position (a little off the heading for single
-            // runway airports)
-            fgSetString("/sim/airport/closest-airport-id",  apt.c_str());
-            fgSetString("/sim/tower/airport-id",  apt.c_str());
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos && !apt.empty() ) {
-        // An airport is requested (find runway closest to hdg)
-        if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
-            // set tower position (a little off the heading for single
-            // runway airports)
-            fgSetString("/sim/airport/closest-airport-id",  apt.c_str());
-            fgSetString("/sim/tower/airport-id",  apt.c_str());
-            set_pos = true;
-        }
-    }
-
-    if (hdg_preset->getDoubleValue() > 9990.0)
-        hdg_preset->setDoubleValue(hdg);
-
-    if ( !set_pos && !vor.empty() ) {
-        // a VOR is requested
-        if ( fgSetPosFromNAV( vor, vor_freq, FGPositioned::VOR ) ) {
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos && !ndb.empty() ) {
-        // an NDB is requested
-        if ( fgSetPosFromNAV( ndb, ndb_freq, FGPositioned::NDB ) ) {
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos && !carrier.empty() ) {
-        // an aircraft carrier is requested
-        if ( fgSetPosFromCarrier( carrier, parkpos ) ) {
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos && !fix.empty() ) {
-        // a Fix is requested
-        if ( fgSetPosFromFix( fix ) ) {
-            set_pos = true;
-        }
-    }
-
-    if ( !set_pos ) {
-        // No lon/lat specified, no airport specified, default to
-        // middle of KSFO field.
-        fgSetDouble("/sim/presets/longitude-deg", -122.374843);
-        fgSetDouble("/sim/presets/latitude-deg", 37.619002);
-    }
-
-    fgSetDouble( "/position/longitude-deg",
-                 fgGetDouble("/sim/presets/longitude-deg") );
-    fgSetDouble( "/position/latitude-deg",
-                 fgGetDouble("/sim/presets/latitude-deg") );
-    fgSetDouble( "/orientation/heading-deg", hdg_preset->getDoubleValue());
-
-    // determine if this should be an on-ground or in-air start
-    if ((fabs(gs) > 0.01 || fabs(od) > 0.1 || alt > 0.1) && carrier.empty()) {
-        fgSetBool("/sim/presets/onground", false);
-    } else {
-        fgSetBool("/sim/presets/onground", true);
+  flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
+  static bool doingRebuild = false;
+  if (doingRebuild || cache->isRebuildRequired()) {
+    doingRebuild = true;
+    bool finished = cache->rebuild();
+    if (!finished) {
+      // sleep to give the rebuild thread more time
+      SGTimeStamp::sleepForMSec(50);
+      return false;
     }
-
-    return true;
+  }
+  
+  FGTACANList *channellist = new FGTACANList;
+  globals->set_channellist( channellist );
+  
+  SGPath path(globals->get_fg_root());
+  path.append( "Navaids/TACAN_freq.dat" );
+  flightgear::loadTacan(path, channellist);
+  
+  return true;
 }
 
-
 // General house keeping initializations
 bool fgInitGeneral() {
     string root;
@@ -1020,18 +537,19 @@ bool fgInitGeneral() {
         SG_LOG( SG_GENERAL, SG_ALERT,
                 "Cannot continue without a path to the base package "
                 << "being defined." );
-        exit(-1);
+        return false;
     }
     SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
 
-    globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
+    // Note: browser command is hard-coded for Mac/Windows, so this only affects other platforms
+    globals->set_browser(fgGetString("/sim/startup/browser-app", WEB_BROWSER));
+    fgSetString("/sim/startup/browser-app", globals->get_browser());
 
-    char buf[512], *cwd = getcwd(buf, 511);
-    buf[511] = '\0';
+    simgear::Dir cwd(simgear::Dir::current());
     SGPropertyNode *curr = fgGetNode("/sim", true);
     curr->removeChild("fg-current", 0, false);
     curr = curr->getChild("fg-current", 0, true);
-    curr->setStringValue(cwd ? cwd : "");
+    curr->setStringValue(cwd.path().str());
     curr->setAttribute(SGPropertyNode::WRITE, false);
 
     fgSetBool("/sim/startup/stdout-to-terminal", isatty(1) != 0 );
@@ -1039,13 +557,27 @@ bool fgInitGeneral() {
     return true;
 }
 
+// Write various configuraton values out to the logs
+void fgOutputSettings()
+{    
+    SG_LOG( SG_GENERAL, SG_INFO, "Configuration State" );
+    SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
+    
+    SG_LOG( SG_GENERAL, SG_INFO, "aircraft-dir = " << '"' << fgGetString("/sim/aircraft-dir") << '"' );
+    SG_LOG( SG_GENERAL, SG_INFO, "fghome-dir = " << '"' << globals->get_fg_home() << '"');
+    SG_LOG( SG_GENERAL, SG_INFO, "aircraft-dir = " << '"' << fgGetString("/sim/aircraft-dir") << '"');
+    
+    SG_LOG( SG_GENERAL, SG_INFO, "aircraft-search-paths = \n\t" << simgear::strutils::join(globals->get_aircraft_paths(), "\n\t") );
+    SG_LOG( SG_GENERAL, SG_INFO, "scenery-search-paths = \n\t" << simgear::strutils::join(globals->get_fg_scenery(), "\n\t") );
+}
+
 // This is the top level init routine which calls all the other
 // initialization routines.  If you are adding a subsystem to flight
 // gear, its initialization call should located in this routine.
 // Returns non-zero if a problem encountered.
-bool fgInitSubsystems() {
+void fgCreateSubsystems(bool duringReset) {
 
-    SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
+    SG_LOG( SG_GENERAL, SG_INFO, "Creating Subsystems");
     SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
 
     ////////////////////////////////////////////////////////////////////
@@ -1055,7 +587,7 @@ bool fgInitSubsystems() {
     // to be updated in every loop.
     // Sound manager is updated last so it can use the CPU while the GPU
     // is processing the scenery (doubled the frame-rate for me) -EMH-
-    globals->add_subsystem("sound", new SGSoundMgr, SGSubsystemMgr::SOUND);
+    globals->add_subsystem("sound", new FGSoundManager, SGSubsystemMgr::SOUND);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the event manager subsystem.
@@ -1068,8 +600,10 @@ bool fgInitSubsystems() {
     // Initialize the property interpolator subsystem. Put into the INIT
     // group because the "nasal" subsystem may need it at GENERAL take-down.
     ////////////////////////////////////////////////////////////////////
-    globals->add_subsystem("interpolator", new SGInterpolator, SGSubsystemMgr::INIT);
-
+    FGInterpolator* interp = new FGInterpolator;
+    interp->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
+    globals->add_subsystem("prop-interpolator", interp, SGSubsystemMgr::INIT);
+    SGPropertyNode::setInterpolationMgr(interp);
 
     ////////////////////////////////////////////////////////////////////
     // Add the FlightGear property utilities.
@@ -1092,12 +626,11 @@ bool fgInitSubsystems() {
     mpath.append( fgGetString("/sim/rendering/materials-file") );
     if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(),
             globals->get_props()) ) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Error loading materials file " << mpath.str() );
-        exit(-1);
+       throw sg_io_exception("Error loading materials file", mpath);
     }
-
-
+    
+    globals->add_subsystem( "http", new FGHTTPClient );
+    
     ////////////////////////////////////////////////////////////////////
     // Initialize the scenery management subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1125,9 +658,11 @@ bool fgInitSubsystems() {
     // autopilot.)
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("instrumentation", new FGInstrumentMgr, SGSubsystemMgr::FDM);
     globals->add_subsystem("systems", new FGSystemMgr, SGSubsystemMgr::FDM);
-
+    globals->add_subsystem("instrumentation", new FGInstrumentMgr, SGSubsystemMgr::FDM);
+    globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("cockpit-displays", new flightgear::CockpitDisplayManager, SGSubsystemMgr::DISPLAY);
+  
     ////////////////////////////////////////////////////////////////////
     // Initialize the XML Autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1140,7 +675,7 @@ bool fgInitSubsystems() {
     // Initialize the Input-Output subsystem
     ////////////////////////////////////////////////////////////////////
     globals->add_subsystem( "io", new FGIO );
-
+  
     ////////////////////////////////////////////////////////////////////
     // Create and register the logger.
     ////////////////////////////////////////////////////////////////////
@@ -1158,27 +693,29 @@ bool fgInitSubsystems() {
     ////////////////////////////////////////////////////////////////////
     fgGetBool("/sim/rendering/bump-mapping", false);
 
-
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the canvas 2d drawing subsystem.
+    ////////////////////////////////////////////////////////////////////
+    simgear::canvas::Canvas::setSystemAdapter(
+      simgear::canvas::SystemAdapterPtr(new canvas::FGCanvasSystemAdapter)
+    );
+    globals->add_subsystem("Canvas", new CanvasMgr, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("CanvasGUI", new GUIMgr, SGSubsystemMgr::DISPLAY);
 
     ////////////////////////////////////////////////////////////////////
-    // Initialise the ATC Manager
-    // Note that this is old stuff, but might be necessesary for the 
+    // Initialise the ATIS Manager
+    // Note that this is old stuff, but is necessary for the
     // current ATIS implementation. Therefore, leave it in here
     // until the ATIS system is ported over to make use of the ATIS 
     // sub system infrastructure.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("ATC-old", new FGATCMgr, SGSubsystemMgr::INIT);
+    globals->add_subsystem("ATIS", new FGATISMgr, SGSubsystemMgr::INIT, 0.4);
 
     ////////////////////////////////////////////////////////////////////
    // Initialize the ATC subsystem
     ////////////////////////////////////////////////////////////////////
     globals->add_subsystem("ATC", new FGATCManager, SGSubsystemMgr::POST_FDM);
-    ////////////////////////////////////////////////////////////////////
-    // Initialise the ATIS Subsystem
-    ////////////////////////////////////////////////////////////////////
-    //globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
-
 
     ////////////////////////////////////////////////////////////////////
     // Initialize multiplayer subsystem
@@ -1203,40 +740,30 @@ bool fgInitSubsystems() {
     // Add a new 2D panel.
     ////////////////////////////////////////////////////////////////////
 
-    string panel_path(fgGetString("/sim/panel/path"));
-    if (!panel_path.empty()) {
-      FGPanel* p = fgReadPanel(panel_path);
-      if (p) {
-        globals->set_current_panel(p);
-        p->init();
-        p->bind();
-        SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
-      } else {
-        SG_LOG( SG_INPUT, SG_ALERT,
-                "Error reading new panel from " << panel_path );
-      }
-    }
-
+    fgSetArchivable("/sim/panel/visibility");
+    fgSetArchivable("/sim/panel/x-offset");
+    fgSetArchivable("/sim/panel/y-offset");
+    fgSetArchivable("/sim/panel/jitter");
+  
     ////////////////////////////////////////////////////////////////////
     // Initialize the controls subsystem.
     ////////////////////////////////////////////////////////////////////
-
-    globals->get_controls()->init();
-    globals->get_controls()->bind();
-
+    
+    globals->add_subsystem("controls", new FGControls, SGSubsystemMgr::GENERAL);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the input subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("input", new FGInput);
+    globals->add_subsystem("input", new FGInput, SGSubsystemMgr::GENERAL);
 
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the replay subsystem
     ////////////////////////////////////////////////////////////////////
     globals->add_subsystem("replay", new FGReplay);
-
+    globals->add_subsystem("history", new FGFlightHistory);
+    
 #ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
     // Initialize the sound-effects subsystem.
@@ -1244,37 +771,37 @@ bool fgInitSubsystems() {
     globals->add_subsystem("voice", new FGVoiceMgr, SGSubsystemMgr::DISPLAY);
 #endif
 
+#ifdef ENABLE_IAX
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the FGCom subsystem.
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("fgcom", new FGCom);
+#endif
+
     ////////////////////////////////////////////////////////////////////
     // Initialize the lighting subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("lighting", new FGLight, SGSubsystemMgr::DISPLAY);
-    
     // ordering here is important : Nasal (via events), then models, then views
-    globals->add_subsystem("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
-    
-    FGAircraftModel* acm = new FGAircraftModel;
-    globals->set_aircraft_model(acm);
-    globals->add_subsystem("aircraft-model", acm, SGSubsystemMgr::DISPLAY);
+    if (!duringReset) {
+        globals->add_subsystem("lighting", new FGLight, SGSubsystemMgr::DISPLAY);
+        globals->add_subsystem("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
+    }
 
-    FGModelMgr* mm = new FGModelMgr;
-    globals->set_model_mgr(mm);
-    globals->add_subsystem("model-manager", mm, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("aircraft-model", new FGAircraftModel, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("model-manager", new FGModelMgr, SGSubsystemMgr::DISPLAY);
 
-    FGViewMgr *viewmgr = new FGViewMgr;
-    globals->set_viewmgr( viewmgr );
-    globals->add_subsystem("view-manager", viewmgr, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("view-manager", new FGViewMgr, SGSubsystemMgr::DISPLAY);
 
     globals->add_subsystem("tile-manager", globals->get_tile_mgr(), 
       SGSubsystemMgr::DISPLAY);
-      
-    ////////////////////////////////////////////////////////////////////
-    // Bind and initialize subsystems.
-    ////////////////////////////////////////////////////////////////////
-
-    globals->get_subsystem_mgr()->bind();
-    globals->get_subsystem_mgr()->init();
+}
 
+void fgPostInitSubsystems()
+{
+    SGTimeStamp st;
+    st.stamp();
+  
     ////////////////////////////////////////////////////////////////////////
     // Initialize the Nasal interpreter.
     // Do this last, so that the loaded scripts see initialized state
@@ -1282,10 +809,36 @@ bool fgInitSubsystems() {
     FGNasalSys* nasal = new FGNasalSys();
     globals->add_subsystem("nasal", nasal, SGSubsystemMgr::INIT);
     nasal->init();
+    SG_LOG(SG_GENERAL, SG_INFO, "Nasal init took:" << st.elapsedMSec());
 
+    // Ensure IOrules and path validation are working properly by trying to
+    // access a folder/file which should never be accessible.
+    const char* no_access_path =
+#ifdef _WIN32
+      "Z:"
+#endif
+      "/do-not-access";
+
+    if( fgValidatePath(no_access_path, true) )
+      SG_LOG
+      (
+        SG_GENERAL,
+        SG_ALERT,
+        "Check your IOrules! (write to '" << no_access_path << "' is allowed)"
+      );
+    if( fgValidatePath(no_access_path, false) )
+      SG_LOG
+      (
+        SG_GENERAL,
+        SG_ALERT,
+        "Check your IOrules! (read from '" << no_access_path << "' is allowed)"
+      );
+  
     // initialize methods that depend on other subsystems.
+    st.stamp();
     globals->get_subsystem_mgr()->postinit();
-
+    SG_LOG(SG_GENERAL, SG_INFO, "Subsystems postinit took:" << st.elapsedMSec());
+  
     ////////////////////////////////////////////////////////////////////////
     // End of subsystem initialization.
     ////////////////////////////////////////////////////////////////////
@@ -1298,22 +851,24 @@ bool fgInitSubsystems() {
                                 // Save the initial state for future
                                 // reference.
     globals->saveInitialState();
-    
-    return true;
 }
 
 // Reset: this is what the 'reset' command (and hence, GUI) is attached to
 void fgReInitSubsystems()
 {
-    static const SGPropertyNode *master_freeze
-        = fgGetNode("/sim/freeze/master");
+#ifdef NEW_RESET
+    fgResetIdleState();
+    return;
+#endif
+    
+    SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
 
     SG_LOG( SG_GENERAL, SG_INFO, "fgReInitSubsystems()");
 
 // setup state to begin re-init
     bool freeze = master_freeze->getBoolValue();
     if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", true);
+        master_freeze->setBoolValue(true);
     }
     
     fgSetBool("/sim/signals/reinit", true);
@@ -1329,7 +884,15 @@ void fgReInitSubsystems()
     globals->restoreInitialState();
 
     // update our position based on current presets
-    fgInitPosition();
+    // this will mark position as needed finalized which we'll do in the
+    // main-loop
+    flightgear::initPosition();
+    
+    simgear::SGTerraSync* terraSync =
+        static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
+    if (terraSync) {
+        terraSync->reposition();
+    }
     
     // Force reupdating the positions of the ai 3d models. They are used for
     // initializing ground level for the FDM.
@@ -1344,133 +907,151 @@ void fgReInitSubsystems()
     // reload offsets from config defaults
     globals->get_viewmgr()->reinit();
 
+    // ugly: finalizePosition waits for METAR to arrive for the new airport.
+    // we don't re-init the environment manager here, since historically we did
+    // not, and doing so seems to have other issues. All that's needed is to
+    // schedule METAR fetch immediately, so it's available for finalizePosition.
+    // So we manually extract the METAR-fetching component inside the environment
+    // manager, and re-init that.
+    SGSubsystemGroup* envMgr = static_cast<SGSubsystemGroup*>(globals->get_subsystem("environment"));
+    if (envMgr) {
+      envMgr->get_subsystem("realwx")->reinit();
+    }
+  
     globals->get_subsystem("time")->reinit();
 
     // need to bind FDMshell again, since we manually unbound it above...
     globals->get_subsystem("flight")->bind();
 
+    // need to reset aircraft (systems/instruments) so they can adapt to current environment
+    globals->get_subsystem("systems")->reinit();
+    globals->get_subsystem("instrumentation")->reinit();
+
+    globals->get_subsystem("ATIS")->reinit();
+
 // setup state to end re-init
     fgSetBool("/sim/signals/reinit", false);
     if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", false);
+        master_freeze->setBoolValue(false);
     }
     fgSetBool("/sim/sceneryloaded",false);
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-// helper object to implement the --show-aircraft command.
-// resides here so we can share the fgFindAircraftInDir template above,
-// and hence ensure this command lists exectly the same aircraft as the normal
-// loading path.
-class ShowAircraft 
+void fgStartNewReset()
 {
-public:
-  ShowAircraft()
-  {
-    _minStatus = getNumMaturity(fgGetString("/sim/aircraft-min-status", "all"));
-  }
-  
-  
-  void show(const SGPath& path)
-  {
-    fgFindAircraftInDir(path, this, &ShowAircraft::processAircraft);
-  
-    std::sort(_aircraft.begin(), _aircraft.end(), ciLessLibC());
-    SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows
-    cout << "Available aircraft:" << endl;
-    for ( unsigned int i = 0; i < _aircraft.size(); i++ ) {
-        cout << _aircraft[i] << endl;
-    }
-  }
-  
-private:
-  bool processAircraft(const SGPath& path)
-  {
-    SGPropertyNode root;
-    try {
-       readProperties(path.str(), &root);
-    } catch (sg_exception& ) {
-       return false;
-    }
-  
-    int maturity = 0;
-    string descStr("   ");
-    descStr += path.file();
-  // trim common suffix from file names
-    int nPos = descStr.rfind("-set.xml");
-    if (nPos == (int)(descStr.size() - 8)) {
-      descStr.resize(nPos);
-    }
+    SGPropertyNode_ptr preserved(new SGPropertyNode);
     
-    SGPropertyNode *node = root.getNode("sim");
-    if (node) {
-      SGPropertyNode* desc = node->getNode("description");
-      // if a status tag is found, read it in
-      if (node->hasValue("status")) {
-        maturity = getNumMaturity(node->getStringValue("status"));
-      }
-      
-      if (desc) {
-        if (descStr.size() <= 27+3) {
-          descStr.append(29+3-descStr.size(), ' ');
-        } else {
-          descStr += '\n';
-          descStr.append( 32, ' ');
+    if (!copyPropertiesWithAttribute(globals->get_props(), preserved, SGPropertyNode::PRESERVE))
+        SG_LOG(SG_GENERAL, SG_ALERT, "Error saving preserved state");
+    
+    fgSetBool("/sim/signals/reinit", true);
+    fgSetBool("/sim/freeze/master", true);
+    
+    SGSubsystemMgr* subsystemManger = globals->get_subsystem_mgr();
+    // Nasal is manually inited in fgPostInit, ensure it's already shutdown
+    // before other subsystems, so Nasal listeners don't fire during shutdonw
+    SGSubsystem* nasal = subsystemManger->get_subsystem("nasal");
+    nasal->shutdown();
+    nasal->unbind();
+    subsystemManger->remove("nasal");
+    
+    subsystemManger->shutdown();
+    subsystemManger->unbind();
+    
+    // remove most subsystems, with a few exceptions.
+    for (int g=0; g<SGSubsystemMgr::MAX_GROUPS; ++g) {
+        SGSubsystemGroup* grp = subsystemManger->get_group(static_cast<SGSubsystemMgr::GroupType>(g));
+        const string_list& names(grp->member_names());
+        string_list::const_iterator it;
+        for (it = names.begin(); it != names.end(); ++it) {
+            if ((*it == "time") || (*it == "terrasync") || (*it == "events")
+                || (*it == "lighting"))
+            {
+                continue;
+            }
+            
+            try {
+                subsystemManger->remove(it->c_str());
+            } catch (std::exception& e) {
+                SG_LOG(SG_GENERAL, SG_INFO, "caught std::exception shutting down:" << *it);
+            } catch (...) {
+                SG_LOG(SG_GENERAL, SG_INFO, "caught generic exception shutting down:" << *it);
+            }
+            
+            // don't delete here, dropping the ref should be sufficient
         }
-        descStr += desc->getStringValue();
-      }
-    } // of have 'sim' node
+    } // of top-level groups iteration
     
-    if (maturity < _minStatus) {
-      return false;
-    }
-
-    _aircraft.push_back(descStr);
-    return false;
-  }
-
-
-  int getNumMaturity(const char * str) 
-  {
-    // changes should also be reflected in $FG_ROOT/data/options.xml & 
-    // $FG_ROOT/data/Translations/string-default.xml
-    const char* levels[] = {"alpha","beta","early-production","production"}; 
-
-    if (!strcmp(str, "all")) {
-      return 0;
+    // order is important here since tile-manager shutdown needs to
+    // access the scenery object
+    globals->set_tile_mgr(NULL);
+    globals->set_scenery(NULL);
+    flightgear::CameraGroup::setDefault(NULL);
+    
+    FGRenderer* render = globals->get_renderer();
+    // don't cancel the pager until after shutdown, since AIModels (and
+    // potentially others) can queue delete requests on the pager.
+    render->getViewer()->getDatabasePager()->cancel();
+    render->getViewer()->getDatabasePager()->clear();
+    
+    osgDB::Registry::instance()->clearObjectCache();
+    
+    // preserve the event handler; re-creating it would entail fixing the
+    // idle handler
+    osg::ref_ptr<flightgear::FGEventHandler> eventHandler = render->getEventHandler();
+    
+    globals->set_renderer(NULL);
+    globals->set_matlib(NULL);
+    globals->set_chatter_queue(NULL);
+    
+    simgear::clearEffectCache();
+    simgear::SGModelLib::resetPropertyRoot();
+        
+    simgear::GlobalParticleCallback::setSwitch(NULL);
+    
+    globals->resetPropertyRoot();
+    fgInitConfig(0, NULL, true);
+    fgInitGeneral(); // all of this?
+    
+    if ( copyProperties(preserved, globals->get_props()) ) {
+        SG_LOG( SG_GENERAL, SG_INFO, "Preserved state restored successfully" );
+    } else {
+        SG_LOG( SG_GENERAL, SG_INFO,
+               "Some errors restoring preserved state (read-only props?)" );
     }
 
-    for (size_t i=0; i<(sizeof(levels)/sizeof(levels[0]));i++) 
-      if (strcmp(str,levels[i])==0)
-        return i;
-
-    return 0;
-  }
+    fgGetNode("/sim")->removeChild("aircraft-dir");
+    fgInitAircraft(true);
+    flightgear::Options::sharedInstance()->processOptions();
+    
+    render = new FGRenderer;
+    render->setEventHandler(eventHandler);
+    globals->set_renderer(render);
+    render->init();
+    render->setViewer(viewer.get());
 
-  // recommended in Meyers, Effective STL when internationalization and embedded
-  // NULLs aren't an issue.  Much faster than the STL or Boost lex versions.
-  struct ciLessLibC : public std::binary_function<string, string, bool>
-  {
-    bool operator()(const std::string &lhs, const std::string &rhs) const
-    {
-      return strcasecmp(lhs.c_str(), rhs.c_str()) < 0 ? 1 : 0;
-    }
-  };
+    viewer->getDatabasePager()->setUpThreads(1, 1);
+    
+    // must do this before splashinit for Rembrandt
+    flightgear::CameraGroup::buildDefaultGroup(viewer.get());
+    render->splashinit();
+    
+    fgOSResetProperties();
 
-  int _minStatus;
-  string_list _aircraft;
-};
+// init some things manually
+// which do not follow the regular init pattern
+    
+    globals->get_event_mgr()->init();
+    globals->get_event_mgr()->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
+    
+    globals->set_matlib( new SGMaterialLib );
+    
+// terra-sync needs the property tree root, pass it back in
+    simgear::SGTerraSync* terra_sync = static_cast<simgear::SGTerraSync*>(subsystemManger->get_subsystem("terrasync"));
+    terra_sync->setRoot(globals->get_props());
 
-void fgShowAircraft(const SGPath &path)
-{
-    ShowAircraft s;
-    s.show(path);
-        
-#ifdef _MSC_VER
-    cout << "Hit a key to continue..." << endl;
-    cin.get();
-#endif
+    fgSetBool("/sim/signals/reinit", false);
+    fgSetBool("/sim/freeze/master", false);
+    fgSetBool("/sim/sceneryloaded",false);
 }
 
-