#ifndef __NASALSYS_HXX
#define __NASALSYS_HXX
-#include <simgear/misc/sg_path.hxx>
-#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx> // keep before any cppbind include to enable
+ // SGVec2<T> conversion.
#include <simgear/misc/sg_dir.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/nasal/cppbind/NasalHash.hxx>
#include <simgear/nasal/nasal.h>
-#include <simgear/scene/model/modellib.hxx>
-#include <simgear/xml/easyxml.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/threads/SGQueue.hxx>
+// Required only for MSVC
+#ifdef _MSC_VER
+# include <Scripting/NasalModelData.hxx>
+#endif
+
#include <map>
class FGNasalScript;
class FGNasalListener;
+class SGCondition;
+class FGNasalModelData;
+class NasalCommand;
+class FGNasalModuleListener;
+namespace simgear { class BufferedLogCallback; }
-/** Nasal model data container.
- * load and unload methods must be run in main thread (not thread-safe). */
-class FGNasalModelData : public SGReferenced
-{
-public:
- /** Constructor to be run in an arbitrary thread. */
- FGNasalModelData(SGPropertyNode *root, const string& path, SGPropertyNode *prop,
- SGPropertyNode* load, SGPropertyNode* unload) :
- _path(path),
- _root(root), _prop(prop),
- _load(load), _unload(unload)
- {
- }
-
- /** Load hook. Always call from inside the main loop. */
- void load();
-
- /** Unload hook. Always call from inside the main loop. */
- void unload();
-
-private:
- static unsigned int _module_id;
-
- string _module, _path;
- SGPropertyNode_ptr _root, _prop;
- SGConstPropertyNode_ptr _load, _unload;
-};
-
-/** Thread-safe proxy for FGNasalModelData.
- * modelLoaded/destroy methods only register the requested
- * operation. Actual (un)loading of Nasal module is deferred
- * and done in the main loop. */
-class FGNasalModelDataProxy : public simgear::SGModelData
-{
-public:
- FGNasalModelDataProxy(SGPropertyNode *root = 0) :
- _root(root), _data(0)
- {
- }
-
- ~FGNasalModelDataProxy();
-
- void modelLoaded(const string& path, SGPropertyNode *prop, osg::Node *);
-
-protected:
- SGPropertyNode_ptr _root;
- SGSharedPtr<FGNasalModelData> _data;
-};
+SGPropertyNode* ghostToPropNode(naRef ref);
class FGNasalSys : public SGSubsystem
{
FGNasalSys();
virtual ~FGNasalSys();
virtual void init();
+ virtual void shutdown();
+
virtual void update(double dt);
// Loads a nasal script from an external file and inserts it as a
// this function. The "name" argument specifies the "file name"
// for the source code that will be printed in Nasal stack traces
// on error.
- FGNasalScript* parseScript(const char* src, const char* name=0);
+ // FGNasalScript* parseScript(const char* src, const char* name=0);
// Implementation of the settimer extension function
void setTimer(naContext c, int argc, naRef* args);
// Returns a ghost wrapper for the current _cmdArg
naRef cmdArgGhost();
+ void setCmdArg(SGPropertyNode* aNode);
+
+ /**
+ * create Nasal props.Node for an SGPropertyNode*
+ * This is the actual ghost, wrapped in a Nasal sugar class.
+ */
+ naRef wrappedPropsNode(SGPropertyNode* aProps);
+
// Callbacks for command and timer bindings
+ virtual bool handleCommand( const char* moduleName,
+ const char* fileName,
+ const char* src,
+ const SGPropertyNode* arg = 0 );
virtual bool handleCommand(const SGPropertyNode* arg);
bool createModule(const char* moduleName, const char* fileName,
void deleteModule(const char* moduleName);
+ void addCommand(naRef func, const std::string& name);
+ void removeCommand(const std::string& name);
+
+ /**
+ * Set member of specified hash to given value
+ */
+ void hashset(naRef hash, const char* key, naRef val);
+
+ /**
+ * Set member of globals hash to given value
+ */
+ void globalsSet(const char* key, naRef val);
+
naRef call(naRef code, int argc, naRef* args, naRef locals);
+ naRef callWithContext(naContext ctx, naRef code, int argc, naRef* args, naRef locals);
naRef callMethod(naRef code, naRef self, int argc, naRef* args, naRef locals);
+ naRef callMethodWithContext(naContext ctx, naRef code, naRef self, int argc, naRef* args, naRef locals);
naRef propNodeGhost(SGPropertyNode* handle);
-
- void registerToLoad(FGNasalModelData* data) { _loadList.push(data);}
- void registerToUnload(FGNasalModelData* data) { _unloadList.push(data);}
+
+ void registerToLoad(FGNasalModelData* data);
+ void registerToUnload(FGNasalModelData* data);
// can't call this 'globals' due to naming clash
naRef nasalGlobals() const
{ return _globals; }
-
- naContext context() const
- { return _context; }
+
+ nasal::Hash getGlobals() const
+ { return nasal::Hash(_globals, _context); }
// This mechanism is here to allow naRefs to be passed to
// locations "outside" the interpreter. Normally, such a
// when done.
int gcSave(naRef r);
void gcRelease(int key);
+
+ /**
+ * Check if IOrules correctly work to limit access from Nasal scripts to the
+ * file system.
+ *
+ * @note Just a simple test is performed to check if access to a path is
+ * possible which should never be possible (The actual path refers to
+ * a file/folder named 'do-not-access' in the file system root).
+ *
+ * @see http://wiki.flightgear.org/IOrules
+ *
+ * @return Whether the check was successful.
+ */
+ bool checkIOrules();
+
+ /// retrive the associated log object, for displaying log
+ /// output somewhere (a UI, presumably)
+ simgear::BufferedLogCallback* log() const
+ { return _log; }
private:
- friend class FGNasalScript;
+ //friend class FGNasalScript;
friend class FGNasalListener;
friend class FGNasalModuleListener;
SGLockedQueue<SGSharedPtr<FGNasalModelData> > _loadList;
SGLockedQueue<SGSharedPtr<FGNasalModelData> > _unloadList;
+ // Delay removing items of the _loadList to ensure the are already attached
+ // to the scene graph (eg. enables to retrieve world position in load
+ // callback).
+ bool _delay_load;
+
//
// FGTimer subclass for handling Nasal timer callbacks.
// See the implementation of the settimer() extension function for
// Listener
std::map<int, FGNasalListener *> _listener;
- vector<FGNasalListener *> _dead_listener;
+ std::vector<FGNasalListener *> _dead_listener;
+
+ std::vector<FGNasalModuleListener*> _moduleListeners;
+
static int _listenerId;
void loadPropertyScripts();
void loadPropertyScripts(SGPropertyNode* n);
void loadScriptDirectory(simgear::Dir nasalDir);
- void addModule(string moduleName, simgear::PathList scripts);
- void hashset(naRef hash, const char* key, naRef val);
- void logError(naContext);
- naRef parse(const char* filename, const char* buf, int len);
+ void addModule(std::string moduleName, simgear::PathList scripts);
+ static void logError(naContext);
+ naRef parse(naContext ctx, const char* filename, const char* buf, int len);
naRef genPropsModule();
+ bool _inited;
naContext _context;
- naRef _globals;
+ naRef _globals,
+ _string;
SGPropertyNode_ptr _cmdArg;
- int _nextGCKey;
- naRef _gcHash;
- int _callCount;
-
- public: void handleTimer(NasalTimer* t);
+ simgear::BufferedLogCallback* _log;
+
+ typedef std::map<std::string, NasalCommand*> NasalCommandDict;
+ NasalCommandDict _commands;
+
+ naRef _wrappedNodeFunc;
+public:
+ void handleTimer(NasalTimer* t);
};
-
+#if 0
class FGNasalScript {
public:
~FGNasalScript() { _nas->gcRelease(_gcKey); }
naCall(_nas->_context, _code, 0, &n, naNil(), naNil());
return naGetError(_nas->_context) == 0;
}
-
+
+ FGNasalSys* sys() const { return _nas; }
private:
friend class FGNasalSys;
naRef _code;
int _gcKey;
FGNasalSys* _nas;
};
-
-
-class FGNasalListener : public SGPropertyChangeListener {
-public:
- FGNasalListener(SGPropertyNode* node, naRef code, FGNasalSys* nasal,
- int key, int id, int init, int type);
-
- virtual ~FGNasalListener();
- virtual void valueChanged(SGPropertyNode* node);
- virtual void childAdded(SGPropertyNode* parent, SGPropertyNode* child);
- virtual void childRemoved(SGPropertyNode* parent, SGPropertyNode* child);
-
-private:
- bool changed(SGPropertyNode* node);
- void call(SGPropertyNode* which, naRef mode);
-
- friend class FGNasalSys;
- SGPropertyNode_ptr _node;
- naRef _code;
- int _gcKey;
- int _id;
- FGNasalSys* _nas;
- int _init;
- int _type;
- unsigned int _active;
- bool _dead;
- long _last_int;
- double _last_float;
- string _last_string;
-};
-
-
-class NasalXMLVisitor : public XMLVisitor {
-public:
- NasalXMLVisitor(naContext c, int argc, naRef* args);
- virtual ~NasalXMLVisitor() { naFreeContext(_c); }
-
- virtual void startElement(const char* tag, const XMLAttributes& a);
- virtual void endElement(const char* tag);
- virtual void data(const char* str, int len);
- virtual void pi(const char* target, const char* data);
-
-private:
- void call(naRef func, int num, naRef a = naNil(), naRef b = naNil());
- naRef make_string(const char* s, int n = -1);
-
- naContext _c;
- naRef _start_element, _end_element, _data, _pi;
-};
+#endif
#endif // __NASALSYS_HXX