- fix two bugs

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

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index 8efb3159ff0d3a5054ad56240cd8db485b88477e..ca7d9f2eaa23d57ae5511f42de3a8263c2303cd4 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
 {
@@ -36,14 +42,24 @@ public:
     // Implementation of the settimer extension function
     void setTimer(int argc, naRef* args);
 
+    // Implementation of the setlistener extension function
+    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, const SGPropertyNode* arg=0);
+
+    void deleteModule(const char* moduleName);
+
 private:
     friend class FGNasalScript;
+    friend class FGNasalListener;
 
     //
     // FGTimer subclass for handling Nasal timer callbacks.
@@ -57,11 +73,13 @@ private:
         FGNasalSys* nasal;
     };
 
+    // Listener
+    map<int, FGNasalListener *> _listener;
+    static int _listenerId;
+
     void loadPropertyScripts();
-    void initModule(const char* moduleName, const char* fileName,
-                    const char* src, int len);
     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);
@@ -78,7 +96,7 @@ private:
     naContext _context;
     naRef _globals;
 
-    SGPropertyNode* _cmdArg;
+    SGPropertyNode_ptr _cmdArg;
 
     int _nextGCKey;
     naRef _gcHash;
@@ -86,12 +104,14 @@ private:
     public: void handleTimer(NasalTimer* t);
 };
 
+
 class FGNasalScript {
 public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
 
     bool call() {
-        naCall(_nas->_context, _code, naNil(), naNil(), naNil());
+        naRef n = naNil();
+        naCall(_nas->_context, _code, 0, &n, naNil(), naNil());
         return naGetError(_nas->_context) == 0;
     }
 
@@ -102,4 +122,34 @@ private:
     FGNasalSys* _nas;
 };
 
+
+class FGNasalListener : public SGPropertyChangeListener {
+public:
+    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;
+    unsigned int _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