- rename fgcommand "set-mouse" to "set-cursor"

- write new {x,y} coords to /devices/status/mice/mouse/{x,y}, so that
  they are immediately available

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 56eb29fcfe44cb96bc56e6caed1d641d49704d6d..34bc4a286447e1b2cbede0675f560a49d9a2ff2c 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -1151,15 +1151,19 @@ do_gui_redraw (const SGPropertyNode * arg)
 
 
 /**
- * Set mouse coordinates and cursor.
+ * Set mouse cursor coordinates and cursor shape.
  */
 static bool
-do_set_mouse (const SGPropertyNode * arg)
+do_set_cursor (const SGPropertyNode * arg)
 {
     if (arg->hasValue("x") || arg->hasValue("y")) {
-        int x = arg->getIntValue("x", fgGetInt("/devices/status/mice/mouse/x"));
-        int y = arg->getIntValue("y", fgGetInt("/devices/status/mice/mouse/y"));
+        SGPropertyNode *mx = fgGetNode("/devices/status/mice/mouse/x", true);
+        SGPropertyNode *my = fgGetNode("/devices/status/mice/mouse/y", true);
+        int x = arg->getIntValue("x", mx->getIntValue());
+        int y = arg->getIntValue("y", my->getIntValue());
         fgWarpMouse(x, y);
+        mx->setIntValue(x);
+        my->setIntValue(y);
     }
 
     SGPropertyNode *cursor = const_cast<SGPropertyNode *>(arg)->getNode("cursor", true);
@@ -1473,7 +1477,7 @@ static struct {
     { "dialog-update", do_dialog_update },
     { "dialog-apply", do_dialog_apply },
     { "gui-redraw", do_gui_redraw },
-    { "set-mouse", do_set_mouse },
+    { "set-cursor", do_set_cursor },
     { "play-audio-sample", do_play_audio_sample },
     { "presets-commit", do_presets_commit },
     { "log-level", do_log_level },