make isatty() available for stdout/stderr (hope it works on MS Windows)

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 532c94867d03570521d42f49a45c3cd6bfa0e10b..08910ba21868102910368fde524814cd059e49ab 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -35,11 +35,13 @@
 #include <string.h>            // strcmp()
 #include <algorithm>
 
-#include STL_STRING
+#include <iostream>
+#include <string>
 
 #include <plib/ul.h>
 
 #include <simgear/math/sg_random.h>
+#include <simgear/props/props_io.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/material/mat.hxx>
@@ -60,9 +62,11 @@
 #include "viewmgr.hxx"
 
 
-SG_USING_STD(string);
-SG_USING_STD(sort);
-SG_USING_NAMESPACE(std);
+using std::string;
+using std::sort;
+using std::cout;
+using std::cerr;
+using std::endl;
 
 #ifndef VERSION
 #define VERSION "CVS "__DATE__
@@ -83,24 +87,13 @@ enum
 static double
 atof( const string& str )
 {
-
-#ifdef __MWERKS__
-    // -dw- if ::atof is called, then we get an infinite loop
-    return std::atof( str.c_str() );
-#else
     return ::atof( str.c_str() );
-#endif
 }
 
 static int
 atoi( const string& str )
 {
-#ifdef __MWERKS__
-    // -dw- if ::atoi is called, then we get an infinite loop
-    return std::atoi( str.c_str() );
-#else
     return ::atoi( str.c_str() );
-#endif
 }
 
 /**
@@ -571,12 +564,8 @@ parse_flightplan(const string& arg)
 
     while ( true ) {
         string line;
-
-#if defined( macintosh )
-        getline( in, line, '\r' );
-#else
         getline( in, line, '\n' );
-#endif
+
         // catch extraneous (DOS) line ending character
         if ( line[line.length() - 1] < 32 )
             line = line.substr( 0, line.length()-1 );
@@ -1242,12 +1231,12 @@ where:
 
 enum OptionType { OPTION_BOOL, OPTION_STRING, OPTION_DOUBLE, OPTION_INT, OPTION_CHANNEL, OPTION_FUNC };
 struct OptionDesc {
-    char *option;
+    const char *option;
     bool has_param;
     enum OptionType type;
-    char *property;
+    const char *property;
     bool b_param;
-    char *s_param;
+    const char *s_param;
     int (*func)( const char * );
     } fgOptionArray[] = {
        
@@ -1293,8 +1282,8 @@ struct OptionDesc {
     {"carrier",                      true,  OPTION_FUNC,   "", false, "", fgOptCarrier },
     {"parkpos",                      true,  OPTION_FUNC,   "", false, "", fgOptParkpos },
     {"fix",                          true,  OPTION_FUNC,   "", false, "", fgOptFIX },
-    {"offset-distance",              true,  OPTION_DOUBLE, "/sim/presets/offset-distance", false, "", 0 },
-    {"offset-azimuth",               true,  OPTION_DOUBLE, "/sim/presets/offset-azimuth", false, "", 0 },
+    {"offset-distance",              true,  OPTION_DOUBLE, "/sim/presets/offset-distance-nm", false, "", 0 },
+    {"offset-azimuth",               true,  OPTION_DOUBLE, "/sim/presets/offset-azimuth-deg", false, "", 0 },
     {"lon",                          true,  OPTION_FUNC,   "", false, "", fgOptLon },
     {"lat",                          true,  OPTION_FUNC,   "", false, "", fgOptLat },
     {"altitude",                     true,  OPTION_FUNC,   "", false, "", fgOptAltitude },
@@ -1443,22 +1432,29 @@ set_property(const string& arg)
     }
     SGPropertyNode *n = fgGetNode(name.c_str(), true);
 
+    bool writable = n->getAttribute(SGPropertyNode::WRITE);
+    if (!writable)
+        n->setAttribute(SGPropertyNode::WRITE, true);
+
+    bool ret = false;
     if (type.empty())
-        return n->setUnspecifiedValue(value.c_str());
+        ret = n->setUnspecifiedValue(value.c_str());
     else if (type == "s" || type == "string")
-        return n->setStringValue(value.c_str());
+        ret = n->setStringValue(value.c_str());
     else if (type == "d" || type == "double")
-        return n->setDoubleValue(strtod(value.c_str(), 0));
+        ret = n->setDoubleValue(strtod(value.c_str(), 0));
     else if (type == "f" || type == "float")
-        return n->setFloatValue(atof(value.c_str()));
+        ret = n->setFloatValue(atof(value.c_str()));
     else if (type == "l" || type == "long")
-        return n->setLongValue(strtol(value.c_str(), 0, 0));
+        ret =  n->setLongValue(strtol(value.c_str(), 0, 0));
     else if (type == "i" || type == "int")
-        return n->setIntValue(atoi(value.c_str()));
+        ret =  n->setIntValue(atoi(value.c_str()));
     else if (type == "b" || type == "bool")
-        return n->setBoolValue(value == "true" || atoi(value.c_str()) != 0);
+        ret =  n->setBoolValue(value == "true" || atoi(value.c_str()) != 0);
 
-    return false;
+    if (!writable)
+        n->setAttribute(SGPropertyNode::WRITE, false);
+    return ret;
 }
 
 
@@ -1639,20 +1635,9 @@ fgParseOptions (const string& path) {
     SG_LOG( SG_GENERAL, SG_INFO, "Processing config file: " << path );
 
     in >> skipcomment;
-#ifndef __MWERKS__
     while ( ! in.eof() ) {
-#else
-    char c = '\0';
-    while ( in.get(c) && c != '\0' ) {
-       in.putback(c);
-#endif
        string line;
-
-#if defined( macintosh )
-        getline( in, line, '\r' );
-#else
        getline( in, line, '\n' );
-#endif
 
         // catch extraneous (DOS) line ending character
         int i;