- disallow listener re-entry to prevent crash/runaway process

[flightgear.git] / src / Scripting / NasalSys.hxx

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index 1a1423bc6950aa63a774fb88db672382339ad543..0b10ad0c7f20e191dd5bdeb90587ee0a33c3d5a0 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -4,8 +4,14 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/nasal/nasal.h>
+#include <simgear/scene/model/model.hxx>
+
+#include <map>
+SG_USING_STD(map);
+
 
 class FGNasalScript;
+class FGNasalListener;
 
 class FGNasalSys : public SGSubsystem
 {
@@ -37,19 +43,20 @@ public:
     void setTimer(int argc, naRef* args);
 
     // Implementation of the setlistener extension function
-    void setListener(int argc, naRef* args);
+    naRef setListener(int argc, naRef* args);
+    naRef removeListener(int argc, naRef* args);
 
     // Returns a ghost wrapper for the current _cmdArg
     naRef cmdArgGhost();
-    
+
     // Callbacks for command and timer bindings
     virtual bool handleCommand(const SGPropertyNode* arg);
 
     void createModule(const char* moduleName, const char* fileName,
                     const char* src, int len);
-                   
-    void screenPrint(const char* src);
-     
+
+    void deleteModule(const char* moduleName);
+
 private:
     friend class FGNasalScript;
     friend class FGNasalListener;
@@ -66,9 +73,13 @@ private:
         FGNasalSys* nasal;
     };
 
+    // Listener
+    map<int, FGNasalListener *> _listener;
+    static int _listenerId;
+
     void loadPropertyScripts();
     void hashset(naRef hash, const char* key, naRef val);
-    void logError();
+    void logError(naContext);
     naRef parse(const char* filename, const char* buf, int len);
     naRef genPropsModule();
     naRef propNodeGhost(SGPropertyNode* handle);
@@ -93,6 +104,7 @@ private:
     public: void handleTimer(NasalTimer* t);
 };
 
+
 class FGNasalScript {
 public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
@@ -110,23 +122,34 @@ private:
     FGNasalSys* _nas;
 };
 
+
 class FGNasalListener : public SGPropertyChangeListener {
 public:
-    FGNasalListener(naRef handler, FGNasalSys* nasal, int gcKey)
-            : _handler(handler), _gcKey(gcKey), _nas(nasal) {}
-
-    void valueChanged(SGPropertyNode* node) {
-        _nas->_cmdArg = node;
-        naCall(_nas->_context, _handler, 0, 0, naNil(), naNil());
-        if(naGetError(_nas->_context))
-            _nas->logError();
-    }
+    FGNasalListener(SGPropertyNode_ptr node, naRef handler,
+                    FGNasalSys* nasal, int key);
+
+    ~FGNasalListener();
+    void valueChanged(SGPropertyNode* node);
 
 private:
     friend class FGNasalSys;
+    SGPropertyNode_ptr _node;
     naRef _handler;
     int _gcKey;
     FGNasalSys* _nas;
+    bool _active;
+};
+
+
+class FGNasalModelData : public SGModelData {
+public:
+    FGNasalModelData() : _unload(0) {}
+    ~FGNasalModelData();
+    void modelLoaded(const string& path, SGPropertyNode *prop, ssgBranch *);
+
+private:
+    string _module;
+    SGConstPropertyNode_ptr _unload;
 };
 
 #endif // __NASALSYS_HXX