_gcHash = naNil();
_nextGCKey = 0; // Any value will do
_callCount = 0;
- _purgeListeners = false;
}
// Does a naCall() in a new context. Wrapped here to make lock
// drop the lock in every extension function that might call back into
// Nasal, we keep a stack depth counter here and only unlock/lock
// around the naCall if it isn't the first one.
-naRef FGNasalSys::call(naRef code, naRef locals)
+naRef FGNasalSys::call(naRef code, int argc, naRef* args, naRef locals)
{
naContext ctx = naNewContext();
if(_callCount) naModUnlock();
_callCount++;
- naRef result = naCall(ctx, code, 0, 0, naNil(), locals);
+ naRef result = naCall(ctx, code, argc, args, naNil(), locals);
if(naGetError(ctx))
logError(ctx);
_callCount--;
strlen(sourceCode));
if(naIsNil(code))
return false;
- call(code, naNil());
+ call(code, 0, 0, naNil());
return true;
}
SGPropertyNode* props = globals->get_props();
naRef val = args[argc-1];
try {
- if(naIsString(val)) props->setStringValue(buf, naStr_data(val));
+ bool r;
+ if(naIsString(val)) r = props->setStringValue(buf, naStr_data(val));
else {
naRef n = naNumValue(val);
if(naIsNil(n))
naRuntimeError(c, "setprop() value is not string or number");
- props->setDoubleValue(buf, n.num);
+ r = props->setDoubleValue(buf, n.num);
}
+ if(!r) naRuntimeError(c, "setprop(): property is not writable");
} catch (const string& err) {
naRuntimeError(c, (char *)err.c_str());
}
try {
readXML(input, visitor);
} catch (const sg_exception& e) {
- string msg = string("parsexml(): file '") + file + "' "
- + e.getFormattedMessage();
- naRuntimeError(c, msg.c_str());
+ naRuntimeError(c, "parsexml(): file '%s' %s",
+ file, e.getFormattedMessage().c_str());
return naNil();
}
return args[0];
#undef HASHSET
}
-// Returns airport data for given airport id ("KSFO"), or for the airport
-// nearest to a given lat/lon pair, or without arguments, to the current
-// aircraft position. Returns nil on error. Only one side of each runway is
-// returned.
+
+class airport_filter : public FGAirportSearchFilter {
+ virtual bool pass(FGAirport *a) { return a->isAirport(); }
+} airport;
+class seaport_filter : public FGAirportSearchFilter {
+ virtual bool pass(FGAirport *a) { return a->isSeaport(); }
+} seaport;
+class heliport_filter : public FGAirportSearchFilter {
+ virtual bool pass(FGAirport *a) { return a->isHeliport(); }
+} heliport;
+
+// Returns data hash for particular or nearest airport of a <type>, or nil
+// on error. Only one side of each runway is contained.
+//
+// airportinfo(<id>); e.g. "KSFO"
+// airportinfo(<type>); type := ("airport"|"seaport"|"heliport")
+// airportinfo() same as airportinfo("airport")
+// airportinfo(<lat>, <lon> [, <type>]);
static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args)
{
- static SGConstPropertyNode_ptr lat = fgGetNode("/position/latitude-deg", true);
- static SGConstPropertyNode_ptr lon = fgGetNode("/position/longitude-deg", true);
+ static SGConstPropertyNode_ptr latn = fgGetNode("/position/latitude-deg", true);
+ static SGConstPropertyNode_ptr lonn = fgGetNode("/position/longitude-deg", true);
+ double lat, lon;
- // airport
FGAirportList *aptlst = globals->get_airports();
FGAirport *apt;
- if(argc == 0)
- apt = aptlst->search(lon->getDoubleValue(), lat->getDoubleValue(), false);
- else if(argc == 1 && naIsString(args[0]))
- apt = aptlst->search(naStr_data(args[0]));
- else if(argc == 2 && naIsNum(args[0]) && naIsNum(args[1]))
- apt = aptlst->search(args[1].num, args[0].num, false);
- else {
- naRuntimeError(c, "airportinfo() with invalid function arguments");
- return naNil();
+ if(argc >= 2 && naIsNum(args[0]) && naIsNum(args[1])) {
+ lat = args[0].num;
+ lon = args[1].num;
+ args += 2;
+ argc -= 2;
+ } else {
+ lat = latn->getDoubleValue();
+ lon = lonn->getDoubleValue();
}
- if(!apt) {
- naRuntimeError(c, "airportinfo(): no airport found");
+ if(argc == 0) {
+ apt = aptlst->search(lon, lat, airport);
+ } else if(argc == 1 && naIsString(args[0])) {
+ const char *s = naStr_data(args[0]);
+ if(!strcmp(s, "airport")) apt = aptlst->search(lon, lat, airport);
+ else if(!strcmp(s, "seaport")) apt = aptlst->search(lon, lat, seaport);
+ else if(!strcmp(s, "heliport")) apt = aptlst->search(lon, lat, heliport);
+ else apt = aptlst->search(s);
+ } else {
+ naRuntimeError(c, "airportinfo() with invalid function arguments");
return naNil();
}
+ if(!apt) return naNil();
string id = apt->getId();
string name = apt->getName();
if(rwylst->search(id, &rwy)) {
do {
if(rwy._id != id) break;
- if(rwy._type != "runway") continue;
+ if(rwy._type[0] != 'r') continue;
+
+ naRef rwyid = naStr_fromdata(naNewString(c),
+ const_cast<char *>(rwy._rwy_no.c_str()),
+ rwy._rwy_no.length());
naRef rwydata = naNewHash(c);
#define HASHSET(s,l,n) naHash_set(rwydata, naStr_fromdata(naNewString(c),s,l),n)
+ HASHSET("id", 2, rwyid);
HASHSET("lat", 3, naNum(rwy._lat));
HASHSET("lon", 3, naNum(rwy._lon));
HASHSET("heading", 7, naNum(rwy._heading));
HASHSET("stopway1", 8, naNum(rwy._stopway1 * SG_FEET_TO_METER));
HASHSET("stopway2", 8, naNum(rwy._stopway2 * SG_FEET_TO_METER));
#undef HASHSET
-
- naRef no = naStr_fromdata(naNewString(c),
- const_cast<char *>(rwy._rwy_no.c_str()),
- rwy._rwy_no.length());
- naHash_set(rwys, no, rwydata);
+ naHash_set(rwys, rwyid, rwydata);
} while(rwylst->next(&rwy));
}
// Table of extension functions. Terminate with zeros.
-static struct { char* name; naCFunction func; } funcs[] = {
+static struct { const char* name; naCFunction func; } funcs[] = {
{ "getprop", f_getprop },
{ "setprop", f_setprop },
{ "print", f_print },
void FGNasalSys::update(double)
{
- if(_purgeListeners) {
- _purgeListeners = false;
- map<int, FGNasalListener *>::iterator it;
- for(it = _listener.begin(); it != _listener.end();) {
- FGNasalListener *nl = it->second;
- if(nl->_dead) {
- _listener.erase(it++);
- delete nl;
- } else {
- ++it;
- }
- }
+ if(!_dead_listener.empty()) {
+ vector<FGNasalListener *>::iterator it, end = _dead_listener.end();
+ for(it = _dead_listener.begin(); it != end; ++it) delete *it;
+ _dead_listener.clear();
}
+
+ // The global context is a legacy thing. We use dynamically
+ // created contexts for naCall() now, so that we can call them
+ // recursively. But there are still spots that want to use it for
+ // naNew*() calls, which end up leaking memory because the context
+ // only clears out its temporary vector when it's *used*. So just
+ // junk it and fetch a new/reinitialized one every frame. This is
+ // clumsy: the right solution would use the dynamic context in all
+ // cases and eliminate _context entirely. But that's more work,
+ // and this works fine (yes, they say "New" and "Free", but
+ // they're very fast, just trust me). -Andy
+ naFreeContext(_context);
+ _context = naNewContext();
}
// Loads the scripts found under /nasal in the global tree
_cmdArg = (SGPropertyNode*)arg;
- call(code, locals);
+ call(code, 0, 0, locals);
hashset(_globals, moduleName, locals);
}
// code doesn't need it.
_cmdArg = (SGPropertyNode*)arg;
- call(code, locals);
+ call(code, 0, 0, locals);
return true;
}
void FGNasalSys::handleTimer(NasalTimer* t)
{
- call(t->handler, naNil());
+ call(t->handler, 0, 0, naNil());
gcRelease(t->gcKey);
}
int FGNasalSys::_listenerId = 0;
-// setlistener(property, func, bool) extension function. The first argument
-// is either a ghost (SGPropertyNode_ptr*) or a string (global property
-// path), the second is a Nasal function, the optional third one a bool.
-// If the bool is true, then the listener is executed initially. The
-// setlistener() function returns a unique id number, that can be used
-// as argument to the removelistener() function.
+// setlistener(<property>, <func> [, <initial=0> [, <persistent=1>]])
+// Attaches a callback function to a property (specified as a global
+// property path string or a SGPropertyNode_ptr* ghost). If the third,
+// optional argument (default=0) is set to 1, then the function is also
+// called initially. If the fourth, optional argument is set to 0, then the
+// function is only called when the property node value actually changes.
+// Otherwise it's called independent of the value whenever the node is
+// written to (default). The setlistener() function returns a unique
+// id number, which is to be used as argument to the removelistener()
+// function.
naRef FGNasalSys::setListener(naContext c, int argc, naRef* args)
{
SGPropertyNode_ptr node;
SG_LOG(SG_NASAL, SG_DEBUG, "Attaching listener to tied property " <<
node->getPath());
- naRef handler = argc > 1 ? args[1] : naNil();
- if(!(naIsCode(handler) || naIsCCode(handler) || naIsFunc(handler))) {
+ naRef code = argc > 1 ? args[1] : naNil();
+ if(!(naIsCode(code) || naIsCCode(code) || naIsFunc(code))) {
naRuntimeError(c, "setlistener() with invalid function argument");
return naNil();
}
- bool initial = argc > 2 && naTrue(args[2]);
+ int type = argc > 3 && naIsNum(args[3]) ? (int)args[3].num : 1;
+ FGNasalListener *nl = new FGNasalListener(node, code, this,
+ gcSave(code), _listenerId, type);
- FGNasalListener *nl = new FGNasalListener(node, handler, this,
- gcSave(handler), _listenerId);
+ bool initial = argc > 2 && naTrue(args[2]);
node->addChangeListener(nl, initial);
_listener[_listenerId] = nl;
return naNil();
}
- FGNasalListener *nl = it->second;
- if(nl->_active) {
- nl->_dead = true;
- _purgeListeners = true;
- return naNum(-1);
- }
-
+ it->second->_dead = true;
+ _dead_listener.push_back(it->second);
_listener.erase(it);
- delete nl;
return naNum(_listener.size());
}
// FGNasalListener class.
-FGNasalListener::FGNasalListener(SGPropertyNode_ptr node, naRef handler,
- FGNasalSys* nasal, int key, int id) :
+FGNasalListener::FGNasalListener(SGPropertyNode *node, naRef code,
+ FGNasalSys* nasal, int key, int id, int type) :
_node(node),
- _handler(handler),
+ _code(code),
_gcKey(key),
_id(id),
_nas(nasal),
+ _type(type),
_active(0),
- _dead(false)
+ _dead(false),
+ _first_call(true),
+ _last_int(0L),
+ _last_float(0.0)
{
}
_nas->gcRelease(_gcKey);
}
-void FGNasalListener::valueChanged(SGPropertyNode* node)
+void FGNasalListener::call(SGPropertyNode* which, naRef mode)
{
- // drop recursive listener calls
- if(_active || _dead)
- return;
-
+ if(_active || _dead) return;
SG_LOG(SG_NASAL, SG_DEBUG, "trigger listener #" << _id);
_active++;
- _nas->_cmdArg = node;
- _nas->call(_handler, naNil());
+ naRef arg[4];
+ arg[0] = _nas->propNodeGhost(which);
+ arg[1] = _nas->propNodeGhost(_node);
+ arg[2] = mode; // value changed, child added/removed
+ arg[3] = naNum(_node != which); // child event?
+ _nas->_cmdArg = _node;
+ _nas->call(_code, 4, arg, naNil());
_active--;
}
+void FGNasalListener::valueChanged(SGPropertyNode* node)
+{
+ if(_type < 2 && node != _node) return; // skip child events
+ if(_type > 0 || changed(_node) || _first_call)
+ call(node, naNum(0));
+
+ _first_call = false;
+}
+
+void FGNasalListener::childAdded(SGPropertyNode*, SGPropertyNode* child)
+{
+ if(_type == 2) call(child, naNum(1));
+}
+
+void FGNasalListener::childRemoved(SGPropertyNode*, SGPropertyNode* child)
+{
+ if(_type == 2) call(child, naNum(-1));
+}
+
+bool FGNasalListener::changed(SGPropertyNode* node)
+{
+ SGPropertyNode::Type type = node->getType();
+ if(type == SGPropertyNode::NONE) return false;
+ if(type == SGPropertyNode::UNSPECIFIED) return true;
+
+ bool result;
+ switch(type) {
+ case SGPropertyNode::BOOL:
+ case SGPropertyNode::INT:
+ case SGPropertyNode::LONG:
+ {
+ long l = node->getLongValue();
+ result = l != _last_int;
+ _last_int = l;
+ return result;
+ }
+ case SGPropertyNode::FLOAT:
+ case SGPropertyNode::DOUBLE:
+ {
+ double d = node->getDoubleValue();
+ result = d != _last_float;
+ _last_float = d;
+ return result;
+ }
+ default:
+ {
+ string s = node->getStringValue();
+ result = s != _last_string;
+ _last_string = s;
+ return result;
+ }
+ }
+}
projects / flightgear.git / blobdiff