X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_commands.cxx;h=389c28fc64c270b6706eaa722a88feeffab0ff27;hb=807bcfb8e0208b6db777ad5c3390b43786011728;hp=d23e3c96f26fafe9ae2ad8c2cd5b52c76b849eb2;hpb=d43dfa54dff6db96ceb65d3b5b03c6e0bf4758fa;p=flightgear.git

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index d23e3c96f..389c28fc6 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -9,26 +9,34 @@
 #include STL_FSTREAM
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/math/sg_random.h>
 #include <simgear/misc/commands.hxx>
 #include <simgear/misc/props.hxx>
+#include <simgear/sg_inlines.h>
 
-#include <GUI/gui.h>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
+#include <FDM/flight.hxx>
+#include <GUI/gui.h>
+#include <GUI/new_gui.hxx>
+#include <GUI/dialog.hxx>
 #include <Scenery/tilemgr.hxx>
+#if defined(HAVE_PLIB_PSL)
+#include <Scripting/scriptmgr.hxx>
+#endif
 #include <Time/tmp.hxx>
 
+#include "fg_init.hxx"
 #include "fg_commands.hxx"
 
 SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
 SG_USING_STD(ofstream);
-#endif
 
 #include "fg_props.hxx"
 #include "fg_io.hxx"
 #include "globals.hxx"
+#include "util.hxx"
 #include "viewmgr.hxx"
 
 
@@ -38,34 +46,95 @@ SG_USING_STD(ofstream);
 ////////////////////////////////////////////////////////////////////////
 
 
+static inline SGPropertyNode *
+get_prop (const SGPropertyNode * arg)
+{
+    return fgGetNode(arg->getStringValue("property[0]", "/null"), true);
+}
+
+static inline SGPropertyNode *
+get_prop2 (const SGPropertyNode * arg)
+{
+    return fgGetNode(arg->getStringValue("property[1]", "/null"), true);
+}
+
+
 /**
- * Template function to wrap a value.
+ * Get a double value and split it as required.
  */
-template <class T>
-static inline void
-do_wrap (T * value, T min, T max)
+static void
+split_value (double full_value, const char * mask,
+             double * unmodifiable, double * modifiable)
 {
-    if (min >= max) {           // basic sanity check
-        *value = min;
+    if (!strcmp("integer", mask)) {
+        *modifiable = (full_value < 0 ? ceil(full_value) : floor (full_value));
+        *unmodifiable = full_value - *modifiable;
+    } else if (!strcmp("decimal", mask)) {
+        *unmodifiable = (full_value < 0 ? ceil(full_value) : floor(full_value));
+        *modifiable = full_value - *unmodifiable;
     } else {
-        T range = max - min;
-        while (*value < min)
-            *value += range;
-        while (*value > max)
-            *value -= range;
+        if (strcmp("all", mask))
+            SG_LOG(SG_GENERAL, SG_ALERT, "Bad value " << mask << " for mask;"
+                   << " assuming 'all'");
+        *unmodifiable = 0;
+        *modifiable = full_value;
     }
 }
 
-static inline SGPropertyNode *
-get_prop (const SGPropertyNode * arg)
+
+/**
+ * Clamp or wrap a value as specified.
+ */
+static void
+limit_value (double * value, const SGPropertyNode * arg)
 {
-    return fgGetNode(arg->getStringValue("property[0]", "/null"), true);
+    const SGPropertyNode * min_node = arg->getChild("min");
+    const SGPropertyNode * max_node = arg->getChild("max");
+
+    bool wrap = arg->getBoolValue("wrap");
+
+    if (min_node == 0 || max_node == 0)
+        wrap = false;
+  
+    if (wrap) {                 // wrap such that min <= x < max
+        double min_val = min_node->getDoubleValue();
+        double max_val = max_node->getDoubleValue();
+        double resolution = arg->getDoubleValue("resolution");
+        if (resolution > 0.0) {
+            // snap to (min + N*resolution), taking special care to handle imprecision
+            int n = (int)floor((*value - min_val) / resolution + 0.5);
+            int steps = (int)floor((max_val - min_val) / resolution + 0.5);
+            SG_NORMALIZE_RANGE(n, 0, steps);
+            *value = min_val + resolution * n;
+        } else {
+            // plain circular wrapping
+            SG_NORMALIZE_RANGE(*value, min_val, max_val);
+        }
+    } else {                    // clamp such that min <= x <= max
+        if ((min_node != 0) && (*value < min_node->getDoubleValue()))
+            *value = min_node->getDoubleValue();
+        else if ((max_node != 0) && (*value > max_node->getDoubleValue()))
+            *value = max_node->getDoubleValue();
+    }
 }
 
-static inline SGPropertyNode *
-get_prop2 (const SGPropertyNode * arg)
+static bool
+compare_values (SGPropertyNode * value1, SGPropertyNode * value2)
 {
-    return fgGetNode(arg->getStringValue("property[1]", "/null"), true);
+    switch (value1->getType()) {
+    case SGPropertyNode::BOOL:
+        return (value1->getBoolValue() == value2->getBoolValue());
+    case SGPropertyNode::INT:
+        return (value1->getIntValue() == value2->getIntValue());
+    case SGPropertyNode::LONG:
+        return (value1->getLongValue() == value2->getLongValue());
+    case SGPropertyNode::FLOAT:
+        return (value1->getFloatValue() == value2->getFloatValue());
+    case SGPropertyNode::DOUBLE:
+        return (value1->getDoubleValue() == value2->getDoubleValue());
+    default:
+        return !strcmp(value1->getStringValue(), value2->getStringValue());
+    }
 }
 
 
@@ -79,34 +148,124 @@ get_prop2 (const SGPropertyNode * arg)
  * Built-in command: do nothing.
  */
 static bool
-do_null (const SGPropertyNode * arg, SGCommandState ** state)
+do_null (const SGPropertyNode * arg)
 {
   return true;
 }
 
+#if defined(HAVE_PLIB_PSL)
+/**
+ * Built-in command: run a PSL script.
+ *
+ * script: the PSL script to execute
+ */
+static bool
+do_script (const SGPropertyNode * arg)
+{
+    FGScriptMgr * mgr = (FGScriptMgr *)globals->get_subsystem("scripting");
+    return mgr->run(arg->getStringValue("script"));
+}
+#endif // HAVE_PLIB_PSL
+
 
 /**
  * Built-in command: exit FlightGear.
  *
- * TODO: show a confirm dialog.
+ * status: the exit status to return to the operating system (defaults to 0)
  */
 static bool
-do_exit (const SGPropertyNode * arg, SGCommandState ** state)
+do_exit (const SGPropertyNode * arg)
 {
-  SG_LOG(SG_INPUT, SG_ALERT, "Program exit requested.");
-  ConfirmExitDialog();
+  SG_LOG(SG_INPUT, SG_INFO, "Program exit requested.");
+  fgExit(arg->getIntValue("status", 0));
   return true;
 }
 
 
+/**
+ * Built-in command: reinitialize one or more subsystems.
+ *
+ * subsystem[*]: the name(s) of the subsystem(s) to reinitialize; if
+ * none is specified, reinitialize all of them.
+ */
+static bool
+do_reinit (const SGPropertyNode * arg)
+{
+    bool result = true;
+
+    vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
+    if (subsystems.size() == 0)
+        globals->get_subsystem_mgr()->reinit();
+    else for (int i = 0; i < subsystems.size(); i++) {
+        const char * name = subsystems[i]->getStringValue();
+        FGSubsystem * subsystem = globals->get_subsystem(name);
+        if (subsystem == 0) {
+            result = false;
+            SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
+        } else {
+            subsystem->reinit();
+        }
+    }
+    return result;
+}
+
+/**
+ * Built-in command: suspend one or more subsystems.
+ *
+ * subsystem[*] - the name(s) of the subsystem(s) to suspend.
+ */
+static bool
+do_suspend (const SGPropertyNode * arg)
+{
+    bool result = true;
+
+    vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
+    for (int i = 0; i < subsystems.size(); i++) {
+        const char * name = subsystems[i]->getStringValue();
+        FGSubsystem * subsystem = globals->get_subsystem(name);
+        if (subsystem == 0) {
+            result = false;
+            SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
+        } else {
+            subsystem->suspend();
+        }
+    }
+    return result;
+}
+
+/**
+ * Built-in command: suspend one or more subsystems.
+ *
+ * subsystem[*] - the name(s) of the subsystem(s) to suspend.
+ */
+static bool
+do_resume (const SGPropertyNode * arg)
+{
+    bool result = true;
+
+    vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
+    for (int i = 0; i < subsystems.size(); i++) {
+        const char * name = subsystems[i]->getStringValue();
+        FGSubsystem * subsystem = globals->get_subsystem(name);
+        if (subsystem == 0) {
+            result = false;
+            SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
+        } else {
+            subsystem->resume();
+        }
+    }
+    return result;
+}
+
+
 /**
  * Built-in command: load flight.
  *
  * file (optional): the name of the file to load (relative to current
- * directory).  Defaults to "fgfs.sav".
+ *   directory).  Defaults to "fgfs.sav"
  */
 static bool
-do_load (const SGPropertyNode * arg, SGCommandState ** state)
+do_load (const SGPropertyNode * arg)
 {
   const string &file = arg->getStringValue("file", "fgfs.sav");
   ifstream input(file.c_str());
@@ -128,7 +287,7 @@ do_load (const SGPropertyNode * arg, SGCommandState ** state)
  * current directory).  Defaults to "fgfs.sav".
  */
 static bool
-do_save (const SGPropertyNode * arg, SGCommandState ** state)
+do_save (const SGPropertyNode * arg)
 {
   const string &file = arg->getStringValue("file", "fgfs.sav");
   bool write_all = arg->getBoolValue("write-all", false);
@@ -153,7 +312,7 @@ do_save (const SGPropertyNode * arg, SGCommandState ** state)
  * and if that's unspecified, to "Panels/Default/default.xml".
  */
 static bool
-do_panel_load (const SGPropertyNode * arg, SGCommandState ** state)
+do_panel_load (const SGPropertyNode * arg)
 {
   string panel_path =
     arg->getStringValue("path",
@@ -166,10 +325,10 @@ do_panel_load (const SGPropertyNode * arg, SGCommandState ** state)
     return false;
   }
   SG_LOG(SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path);
-  current_panel->unbind();
-  delete current_panel;
-  current_panel = new_panel;
-  current_panel->bind();
+  globals->get_current_panel()->unbind();
+  delete globals->get_current_panel();
+  globals->set_current_panel( new_panel );
+  globals->get_current_panel()->bind();
   return true;
 }
 
@@ -183,10 +342,10 @@ do_panel_load (const SGPropertyNode * arg, SGCommandState ** state)
  * y-pos: the y position of the mouse click.
  */
 static bool
-do_panel_mouse_click (const SGPropertyNode * arg, SGCommandState ** state)
+do_panel_mouse_click (const SGPropertyNode * arg)
 {
-  if (current_panel != 0)
-    return current_panel
+  if (globals->get_current_panel() != 0)
+    return globals->get_current_panel()
       ->doMouseAction(arg->getIntValue("button"),
 		      arg->getBoolValue("is-down") ? PU_DOWN : PU_UP,
 		      arg->getIntValue("x-pos"),
@@ -203,15 +362,11 @@ do_panel_mouse_click (const SGPropertyNode * arg, SGCommandState ** state)
  * to FG_ROOT). Defaults to "preferences.xml".
  */
 static bool
-do_preferences_load (const SGPropertyNode * arg, SGCommandState ** state)
+do_preferences_load (const SGPropertyNode * arg)
 {
-  const string &path = arg->getStringValue("path", "preferences.xml");
-  SGPath props_path(globals->get_fg_root());
-  props_path.append(path);
-  SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences from "
-	 << props_path.str());
   try {
-    readProperties(props_path.str(), globals->get_props());
+    fgLoadProps(arg->getStringValue("path", "preferences.xml"),
+                globals->get_props());
   } catch (const sg_exception &e) {
     guiErrorMessage("Error reading global preferences: ", e);
     return false;
@@ -232,34 +387,34 @@ fix_hud_visibility()
   }
 }
 
-void
+static void
 do_view_next( bool )
 {
     globals->get_current_view()->setHeadingOffset_deg(0.0);
     globals->get_viewmgr()->next_view();
     fix_hud_visibility();
-  global_tile_mgr.refresh_view_timestamps();
+    globals->get_tile_mgr()->refresh_view_timestamps();
 }
 
-void
+static void
 do_view_prev( bool )
 {
     globals->get_current_view()->setHeadingOffset_deg(0.0);
     globals->get_viewmgr()->prev_view();
     fix_hud_visibility();
-  global_tile_mgr.refresh_view_timestamps();
+    globals->get_tile_mgr()->refresh_view_timestamps();
 }
 
 /**
  * Built-in command: cycle view.
  */
 static bool
-do_view_cycle (const SGPropertyNode * arg, SGCommandState ** state)
+do_view_cycle (const SGPropertyNode * arg)
 {
   globals->get_current_view()->setHeadingOffset_deg(0.0);
   globals->get_viewmgr()->next_view();
   fix_hud_visibility();
-  global_tile_mgr.refresh_view_timestamps();
+  globals->get_tile_mgr()->refresh_view_timestamps();
 //   fgReshape(fgGetInt("/sim/startup/xsize"), fgGetInt("/sim/startup/ysize"));
   return true;
 }
@@ -268,7 +423,7 @@ do_view_cycle (const SGPropertyNode * arg, SGCommandState ** state)
  * Built-in command: capture screen.
  */
 static bool
-do_screen_capture (const SGPropertyNode * arg, SGCommandState ** state)
+do_screen_capture (const SGPropertyNode * arg)
 {
   fgDumpSnapShot();
   return true;
@@ -279,7 +434,7 @@ do_screen_capture (const SGPropertyNode * arg, SGCommandState ** state)
  * Reload the tile cache.
  */
 static bool
-do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
+do_tile_cache_reload (const SGPropertyNode * arg)
 {
     static const SGPropertyNode *master_freeze
 	= fgGetNode("/sim/freeze/master");
@@ -289,12 +444,10 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
 	fgSetBool("/sim/freeze/master", true);
     }
     // BusyCursor(0);
-    if ( global_tile_mgr.init() ) {
+    if ( globals->get_tile_mgr()->init() ) {
 	// Load the local scenery data
         double visibility_meters = fgGetDouble("/environment/visibility-m");
-	global_tile_mgr.update(fgGetDouble("/position/longitude-deg"),
-			       fgGetDouble("/position/latitude-deg"),
-			       visibility_meters);
+	globals->get_tile_mgr()->update( visibility_meters );
     } else {
 	SG_LOG( SG_GENERAL, SG_ALERT, 
 		"Error in Tile Manager initialization!" );
@@ -312,7 +465,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
  * Update the lighting manually.
  */
 static bool
-do_lighting_update (const SGPropertyNode * arg, SGCommandState ** state)
+do_lighting_update (const SGPropertyNode * arg)
 {
   fgUpdateSkyAndLightingParams();
   return true;
@@ -325,7 +478,7 @@ do_lighting_update (const SGPropertyNode * arg, SGCommandState ** state)
  * property: The name of the property to toggle.
  */
 static bool
-do_property_toggle (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_toggle (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop = get_prop(arg);
   return prop->setBoolValue(!prop->getBoolValue());
@@ -336,165 +489,66 @@ do_property_toggle (const SGPropertyNode * arg, SGCommandState ** state)
  * Built-in command: assign a value to a property.
  *
  * property: the name of the property to assign.
- * value: the value to assign.
+ * value: the value to assign; or
+ * property[1]: the property to copy from.
  */
 static bool
-do_property_assign (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_assign (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop = get_prop(arg);
+  const SGPropertyNode * prop2 = get_prop2(arg);
   const SGPropertyNode * value = arg->getNode("value");
 
-  switch (prop->getType()) {
-
-  case SGPropertyNode::BOOL:
-    return prop->setBoolValue(value->getBoolValue());
-
-  case SGPropertyNode::INT:
-    return prop->setIntValue(value->getIntValue());
-
-  case SGPropertyNode::LONG:
-    return prop->setLongValue(value->getLongValue());
-
-  case SGPropertyNode::FLOAT:
-    return prop->setFloatValue(value->getFloatValue());
-
-  case SGPropertyNode::DOUBLE:
-    return prop->setDoubleValue(value->getDoubleValue());
-
-  case SGPropertyNode::STRING:
-    return prop->setStringValue(value->getStringValue());
-
-  default:
-    return prop->setUnspecifiedValue(value->getStringValue());
-
-  }
+  if (value != 0)
+      return prop->setUnspecifiedValue(value->getStringValue());
+  else if (prop2)
+      return prop->setUnspecifiedValue(prop2->getStringValue());
+  else
+      return false;
 }
 
 
 /**
  * Built-in command: increment or decrement a property value.
  *
+ * If the 'step' argument is present, it will be used; otherwise,
+ * the command uses 'offset' and 'factor', usually from the mouse.
+ *
  * property: the name of the property to increment or decrement.
  * step: the amount of the increment or decrement (default: 0).
- * offset: a normalized amount to offset by (if step is not present).
- * factor: the amount by which to multiply the offset (if step is not present).
+ * offset: offset from the current setting (used for the mouse; multiplied 
+ *         by factor)
+ * factor: scaling amount for the offset (defaults to 1).
  * min: the minimum allowed value (default: no minimum).
  * max: the maximum allowed value (default: no maximum).
+ * mask: 'integer' to apply only to the left of the decimal point, 
+ *       'decimal' to apply only to the right of the decimal point,
+ *       or 'all' to apply to the whole number (the default).
  * wrap: true if the value should be wrapped when it passes min or max;
  *       both min and max must be present for this to work (default:
  *       false).
  */
 static bool
-do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_adjust (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop = get_prop(arg);
-  const SGPropertyNode * step = arg->getChild("step");
-  const SGPropertyNode * offset = arg->getChild("offset");
-  const SGPropertyNode * factor = arg->getChild("factor");
-  const SGPropertyNode * min = arg->getChild("min");
-  const SGPropertyNode * max = arg->getChild("max");
-  bool wrap = arg->getBoolValue("wrap");
-
-  if (min == 0 || max == 0)
-      wrap = false;
 
   double amount = 0;
-  if (step == 0)
-    amount = offset->getDoubleValue() * factor->getDoubleValue();
-
-  switch (prop->getType()) {
-
-  case SGPropertyNode::BOOL: {
-    bool value;
-    if (step != 0)
-      value = step->getBoolValue();
-    else
-      value = (0.0 != amount);
-    if (value)
-      return prop->setBoolValue(!prop->getBoolValue());
-    else
-      return true;
-  }
-
-  case SGPropertyNode::INT: {
-    int value;
-    if (step != 0)
-      value = prop->getIntValue() + step->getIntValue();
-    else
-      value = prop->getIntValue() + int(amount);
-    if (wrap) {
-        do_wrap(&value, min->getIntValue(), max->getIntValue());
-    } else {
-        if (min != 0 && value < min->getIntValue())
-            value = min->getIntValue();
-        if (max != 0 && value > max->getIntValue())
-            value = max->getIntValue();
-    }
-    return prop->setIntValue(value);
-  }
-
-  case SGPropertyNode::LONG: {
-    long value;
-    if (step != 0)
-      value = prop->getLongValue() + step->getLongValue();
-    else
-      value = prop->getLongValue() + long(amount);
-    if (wrap) {
-        do_wrap(&value, min->getLongValue(), max->getLongValue());
-    } else {
-        if (min != 0 && value < min->getLongValue())
-            value = min->getLongValue();
-        if (max != 0 && value > max->getLongValue())
-            value = max->getLongValue();
-    }
-    return prop->setLongValue(value);
-  }
-
-  case SGPropertyNode::FLOAT: {
-    float value;
-    if (step != 0)
-      value = prop->getFloatValue() + step->getFloatValue();
-    else
-      value = prop->getFloatValue() + float(amount);
-    if (wrap) {
-        do_wrap(&value, min->getFloatValue(), max->getFloatValue());
-    } else {
-        if (min != 0 && value < min->getFloatValue())
-            value = min->getFloatValue();
-        if (max != 0 && value > max->getFloatValue())
-            value = max->getFloatValue();
-    }
-    return prop->setFloatValue(value);
-  }
-
-  case SGPropertyNode::DOUBLE:
-  case SGPropertyNode::UNSPECIFIED:
-  case SGPropertyNode::NONE: {
-    double value;
-    if (step != 0)
-      value = prop->getDoubleValue() + step->getDoubleValue();
-    else
-      value = prop->getDoubleValue() + amount;
-    if (wrap) {
-        do_wrap(&value, min->getDoubleValue(), max->getDoubleValue());
-    } else {
-        if (min != 0 && value < min->getDoubleValue())
-            value = min->getDoubleValue();
-        if (max != 0 && value > max->getDoubleValue())
-            value = max->getDoubleValue();
-    }
-    return prop->setDoubleValue(value);
-  }
-
-  case SGPropertyNode::STRING: // doesn't make sense with strings
-    SG_LOG(SG_INPUT, SG_ALERT, "Cannot adjust a string value");
-    return false;
+  if (arg->hasValue("step"))
+      amount = arg->getDoubleValue("step");
+  else
+      amount = (arg->getDoubleValue("factor", 1)
+                * arg->getDoubleValue("offset"));
+          
+  double unmodifiable, modifiable;
+  split_value(prop->getDoubleValue(), arg->getStringValue("mask", "all"),
+              &unmodifiable, &modifiable);
+  modifiable += amount;
+  limit_value(&modifiable, arg);
 
-  default:
-    SG_LOG(SG_INPUT, SG_ALERT, "Unknown value type");
-    return false;
+  prop->setDoubleValue(unmodifiable + modifiable);
 
-  }
+  return true;
 }
 
 
@@ -503,42 +557,30 @@ do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state)
  *
  * property: the name of the property to multiply.
  * factor: the amount by which to multiply.
+ * min: the minimum allowed value (default: no minimum).
+ * max: the maximum allowed value (default: no maximum).
+ * mask: 'integer' to apply only to the left of the decimal point, 
+ *       'decimal' to apply only to the right of the decimal point,
+ *       or 'all' to apply to the whole number (the default).
+ * wrap: true if the value should be wrapped when it passes min or max;
+ *       both min and max must be present for this to work (default:
+ *       false).
  */
 static bool
-do_property_multiply (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_multiply (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop = get_prop(arg);
-  const SGPropertyNode * factor = arg->getChild("factor");
+  double factor = arg->getDoubleValue("factor", 1);
 
-  if (factor == 0)
-      return true;
+  double unmodifiable, modifiable;
+  split_value(prop->getDoubleValue(), arg->getStringValue("mask", "all"),
+              &unmodifiable, &modifiable);
+  modifiable *= factor;
+  limit_value(&modifiable, arg);
 
-  switch (prop->getType()) {
+  prop->setDoubleValue(unmodifiable + modifiable);
 
-  case SGPropertyNode::BOOL:
-    return prop->setBoolValue(prop->getBoolValue() && factor->getBoolValue());
-
-  case SGPropertyNode::INT:
-    return prop->setIntValue(int(prop->getIntValue()
-                                 * factor->getDoubleValue()));
-
-  case SGPropertyNode::LONG:
-    return prop->setLongValue(long(prop->getLongValue()
-				   * factor->getDoubleValue()));
-
-  case SGPropertyNode::FLOAT:
-    return prop->setFloatValue(float(prop->getFloatValue()
-				     * factor->getDoubleValue()));
-
-  case SGPropertyNode::DOUBLE:
-  case SGPropertyNode::UNSPECIFIED:
-  case SGPropertyNode::NONE:
-    return prop->setDoubleValue(prop->getDoubleValue()
-				* factor->getDoubleValue());
-
-  default:			// doesn't make sense with strings
-    return false;
-  }
+  return true;
 }
 
 
@@ -549,7 +591,7 @@ do_property_multiply (const SGPropertyNode * arg, SGCommandState ** state)
  * property[1]: the name of the second property.
  */
 static bool
-do_property_swap (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_swap (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop1 = get_prop(arg);
   SGPropertyNode * prop2 = get_prop2(arg);
@@ -562,7 +604,7 @@ do_property_swap (const SGPropertyNode * arg, SGCommandState ** state)
 
 
 /**
- * Set a property to an axis or other moving input.
+ * Built-in command: Set a property to an axis or other moving input.
  *
  * property: the name of the property to set.
  * setting: the current input setting, usually between -1.0 and 1.0.
@@ -570,21 +612,213 @@ do_property_swap (const SGPropertyNode * arg, SGCommandState ** state)
  * factor: the factor to multiply by (use negative to reverse).
  */
 static bool
-do_property_scale (const SGPropertyNode * arg, SGCommandState ** state)
+do_property_scale (const SGPropertyNode * arg)
 {
   SGPropertyNode * prop = get_prop(arg);
   double setting = arg->getDoubleValue("setting");
   double offset = arg->getDoubleValue("offset", 0.0);
   double factor = arg->getDoubleValue("factor", 1.0);
   bool squared = arg->getBoolValue("squared", false);
-
-  if (squared)
-    setting = (setting < 0 ? -1 : 1) * setting * setting;
+  int power = arg->getIntValue("power", (squared ? 2 : 1));
+
+  int sign = (setting < 0 ? -1 : 1);
+
+  switch (power) {
+  case 1:
+      break;
+  case 2:
+      setting = setting * setting * sign;
+      break;
+  case 3:
+      setting = setting * setting * setting;
+      break;
+  case 4:
+      setting = setting * setting * setting * setting * sign;
+      break;
+  default:
+      setting =  pow(setting, power);
+      if ((power % 2) == 0)
+          setting *= sign;
+      break;
+  }
 
   return prop->setDoubleValue((setting + offset) * factor);
 }
 
 
+/**
+ * Built-in command: cycle a property through a set of values.
+ *
+ * If the current value isn't in the list, the cycle will
+ * (re)start from the beginning.
+ *
+ * property: the name of the property to cycle.
+ * value[*]: the list of values to cycle through.
+ */
+static bool
+do_property_cycle (const SGPropertyNode * arg)
+{
+    SGPropertyNode * prop = get_prop(arg);
+    vector<SGPropertyNode_ptr> values = arg->getChildren("value");
+    int selection = -1;
+    int nSelections = values.size();
+
+    if (nSelections < 1) {
+        SG_LOG(SG_GENERAL, SG_ALERT, "No values for property-cycle");
+        return false;
+    }
+
+                                // Try to find the current selection
+    for (int i = 0; i < nSelections; i++) {
+        if (compare_values(prop, values[i])) {
+            selection = i + 1;
+            break;
+        }
+    }
+
+                                // Default or wrap to the first selection
+    if (selection < 0 || selection >= nSelections)
+        selection = 0;
+
+    prop->setUnspecifiedValue(values[selection]->getStringValue());
+    return true;
+}
+
+
+/**
+ * Built-in command: randomize a numeric property value.
+ *
+ * property: the name of the property value to randomize.
+ * min: the minimum allowed value.
+ * max: the maximum allowed value.
+ */
+static bool
+do_property_randomize (const SGPropertyNode * arg)
+{
+    SGPropertyNode * prop = get_prop(arg);
+    double min = arg->getDoubleValue("min", DBL_MIN);
+    double max = arg->getDoubleValue("max", DBL_MAX);
+    prop->setDoubleValue(sg_random() * (max - min) + min);
+    return true;
+}
+
+
+/**
+ * Built-in command: Show an XML-configured dialog.
+ *
+ * dialog-name: the name of the GUI dialog to display.
+ */
+static bool
+do_dialog_show (const SGPropertyNode * arg)
+{
+    NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+    gui->showDialog(arg->getStringValue("dialog-name"));
+    return true;
+}
+
+
+/**
+ * Built-in Command: Hide the active XML-configured dialog.
+ */
+static bool
+do_dialog_close (const SGPropertyNode * arg)
+{
+    NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+    return gui->closeActiveDialog();
+}
+
+
+/**
+ * Update a value in the active XML-configured dialog.
+ *
+ * object-name: The name of the GUI object(s) (all GUI objects if omitted).
+ */
+static bool
+do_dialog_update (const SGPropertyNode * arg)
+{
+    NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+    FGDialog * dialog = gui->getActiveDialog();
+    if (dialog != 0) {
+        if (arg->hasValue("object-name")) {
+            dialog->updateValue(arg->getStringValue("object-name"));
+        } else {
+            dialog->updateValues();
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+/**
+ * Apply a value in the active XML-configured dialog.
+ *
+ * object-name: The name of the GUI object(s) (all GUI objects if omitted).
+ */
+static bool
+do_dialog_apply (const SGPropertyNode * arg)
+{
+    NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+    FGDialog * dialog = gui->getActiveDialog();
+    if (dialog != 0) {
+        if (arg->hasValue("object-name")) {
+            const char * name = arg->getStringValue("object-name");
+            dialog->applyValue(name);
+            dialog->updateValue(name);
+        } else {
+            dialog->applyValues();
+            dialog->updateValues();
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+/**
+ * Built-in command: commit presets (read from in /sim/presets/)
+ */
+static bool
+do_presets_commit (const SGPropertyNode * arg)
+{
+    // unbind the current fdm state so property changes
+    // don't get lost when we subsequently delete this fdm
+    // and create a new one.
+    cur_fdm_state->unbind();
+        
+    // set position from presets
+    fgInitPosition();
+
+    // BusyCursor(0);
+    fgReInitSubsystems();
+
+    globals->get_tile_mgr()->update( fgGetDouble("/environment/visibility-m") );
+
+#if 0
+    if ( ! fgGetBool("/sim/presets/onground") ) {
+        fgSetBool( "/sim/freeze/master", true );
+        fgSetBool( "/sim/freeze/clock", true );
+    }
+#endif
+
+    return true;
+}
+
+/**
+ * Built-in command: set log level (0 ... 7)
+ */
+static bool
+do_log_level (const SGPropertyNode * arg)
+{
+   sglog().setLogLevels( SG_ALL, (sgDebugPriority)arg->getIntValue() );
+
+   return true;
+}
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Command setup.
@@ -602,7 +836,13 @@ static struct {
   SGCommandMgr::command_t command;
 } built_ins [] = {
     { "null", do_null },
+#if defined(HAVE_PLIB_PSL)
+    { "script", do_script },
+#endif // HAVE_PLIB_PSL
     { "exit", do_exit },
+    { "reinit", do_reinit },
+    { "suspend", do_reinit },
+    { "resume", do_reinit },
     { "load", do_load },
     { "save", do_save },
     { "panel-load", do_panel_load },
@@ -618,6 +858,15 @@ static struct {
     { "property-multiply", do_property_multiply },
     { "property-swap", do_property_swap },
     { "property-scale", do_property_scale },
+    { "property-cycle", do_property_cycle },
+    { "property-randomize", do_property_randomize },
+    { "dialog-show", do_dialog_show },
+    { "dialog-close", do_dialog_close },
+    { "dialog-show", do_dialog_show },
+    { "dialog-update", do_dialog_update },
+    { "dialog-apply", do_dialog_apply },
+    { "presets-commit", do_presets_commit },
+    { "log-level", do_log_level },
     { 0, 0 }			// zero-terminated
 };