fly/flightgear
1
0
Fork 0
Code Activity

add optional SGPropertyNode* argument to NasalSys::createModule. This is

Browse source 
used in dialog.cxx to allow XML dialogs access to their own prop tree via
Nasal's cmdarg(). That way dialogs can generate dynamic content, such as
list entries.
This commit is contained in:
mfranz 2006-04-27 15:56:51 +00:00
parent b64e10fceb
commit 52306b9093
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/GUI/dialog.cxx
View file

@ -335,7 +335,7 @@ FGDialog::FGDialog (SGPropertyNode * props)
if (open) { if (open) {
const char *s = open->getStringValue(); const char *s = open->getStringValue();
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal"); FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s)); nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), props);
} }
} }
display(props); display(props);
@ -351,7 +351,7 @@ FGDialog::~FGDialog ()
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal"); FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
if (_nasal_close) { if (_nasal_close) {
const char *s = _nasal_close->getStringValue(); const char *s = _nasal_close->getStringValue();
nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s)); nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _props);
} }
nas->deleteModule(_module.c_str()); nas->deleteModule(_module.c_str());

4
src/Scripting/NasalSys.cxx
View file

@ -483,7 +483,7 @@ void FGNasalSys::loadModule(SGPath file, const char* module)
// Parse and run. Save the local variables namespace, as it will // Parse and run. Save the local variables namespace, as it will
// become a sub-object of globals. // become a sub-object of globals.
void FGNasalSys::createModule(const char* moduleName, const char* fileName, void FGNasalSys::createModule(const char* moduleName, const char* fileName,
const char* src, int len) const char* src, int len, const SGPropertyNode* arg)
{ {
naRef code = parse(fileName, src, len); naRef code = parse(fileName, src, len);
if(naIsNil(code)) if(naIsNil(code))
@ -498,6 +498,8 @@ void FGNasalSys::createModule(const char* moduleName, const char* fileName,
if(!naHash_get(_globals, modname, &locals)) if(!naHash_get(_globals, modname, &locals))
locals = naNewHash(_context); locals = naNewHash(_context);
_cmdArg = (SGPropertyNode*)arg;
naCall(_context, code, 0, 0, naNil(), locals); naCall(_context, code, 0, 0, naNil(), locals);
if(naGetError(_context)) { if(naGetError(_context)) {
logError(_context); logError(_context);

2
src/Scripting/NasalSys.hxx
View file

@ -53,7 +53,7 @@ public:
virtual bool handleCommand(const SGPropertyNode* arg); virtual bool handleCommand(const SGPropertyNode* arg);
void createModule(const char* moduleName, const char* fileName, void createModule(const char* moduleName, const char* fileName,
const char* src, int len); const char* src, int len, const SGPropertyNode* arg=0);
void deleteModule(const char* moduleName); void deleteModule(const char* moduleName);