#include <simgear/compiler.h>
-#include STL_IOMANIP
-#include STL_STRING
-SG_USING_STD(string);
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <string>
+using std::string;
+using std::cout;
+
typedef string stdString; // puObject has a "string" member
#include <Main/fg_os.hxx> // fgGetKeyModifiers()
static string getValueTypeString(const SGPropertyNode *node)
{
string result;
- assert(node);
SGPropertyNode::Type type = node->getType();
if (type == SGPropertyNode::UNSPECIFIED)
static void dumpProperties(const SGPropertyNode *node)
{
- cout << node->getPath() << "/" << endl;
+ cout << node->getPath() << '/' << endl;
for (int i = 0; i < node->nChildren(); i++) {
const SGPropertyNode *c = node->getChild(i);
SGPropertyNode::Type type = c->getType();
PropertyList::PropertyList(int minx, int miny, int maxx, int maxy, SGPropertyNode *start) :
- puList(minx, miny, maxx, maxy, short(0), 20),
+ puaList(minx, miny, maxx, maxy, short(0), 20),
GUI_ID(FGCLASS_PROPERTYLIST),
_curr(start),
_return(0),
_entries(0),
_num_entries(0),
- _flags(false)
+ _verbose(false)
{
_list_box->setUserData(this);
const char *src = prop_list->_entries[selected];
if (prop_list->_dot_files && (selected < 2)) {
- if (!strcmp(src, ".")) {
+ if (src[0] == '.' && (src[1] == '\0' || src[1] == ' ')) {
if (mod_ctrl)
- prop_list->toggleFlags();
+ prop_list->toggleVerbosity();
else if (mod_shift)
dumpProperties(prop_list->_curr);
selected -= 2;
SGPropertyNode_ptr child = prop_list->_children[selected].node;
- assert(child);
// check if it's a directory
if (child->nChildren()) {
_num_entries += 2; // for . and ..
_entries = new char*[_num_entries + 1];
- _entries[0] = new char[2];
- strcpy(_entries[0], ".");
+ _entries[0] = new char[16];
+ strcpy(_entries[0], _verbose ? ". [verbose]" : ".");
_entries[1] = new char[3];
strcpy(_entries[1], "..");
// Make lists of the children's names, values, etc.
for (i = 0; i < _num_children; i++, pi++) {
- SGPropertyNode *child = _children[i].node;
-
- if (child->nChildren() > 0) {
- stdString name = stdString(child->getDisplayName(true)) + '/';
- _entries[pi] = new char[name.size() + 1];
- strcpy(_entries[pi], name.c_str());
-
- } else {
- _entries[pi] = 0; // make it delete-able
- updateTextForEntry(i);
- _children[i].setListener(this);
- }
+ _children[i].text = &_entries[pi];
+ _entries[pi] = 0; // make it deletable
+ updateTextForEntry(_children[i]);
+ _children[i].setListener(this);
}
_entries[_num_entries] = 0;
}
-void PropertyList::updateTextForEntry(int index)
+void PropertyList::updateTextForEntry(NodeData& data)
{
- assert((index >= 0) && (index < _num_children));
- SGPropertyNode_ptr node = _children[index].node;
-
+ SGPropertyNode *node = data.node;
stdString name = node->getDisplayName(true);
stdString type = getValueTypeString(node);
stdString value = node->getStringValue();
- if (node->getType() == SGPropertyNode::STRING
- || node->getType() == SGPropertyNode::UNSPECIFIED)
- sanitize(value);
-
- stdString line = name + " = '" + value + "' (" + type;
-
- if (_flags) {
- stdString ext;
- if (!node->getAttribute(SGPropertyNode::READ))
- ext += 'r';
- if (!node->getAttribute(SGPropertyNode::WRITE))
- ext += 'w';
- if (node->getAttribute(SGPropertyNode::TRACE_READ))
- ext += 'R';
- if (node->getAttribute(SGPropertyNode::TRACE_WRITE))
- ext += 'W';
- if (node->getAttribute(SGPropertyNode::ARCHIVE))
- ext += 'A';
- if (node->getAttribute(SGPropertyNode::USERARCHIVE))
- ext += 'U';
- if (node->isTied())
- ext += 'T';
- if (ext.size())
- line += ", " + ext;
+ std::ostringstream line;
+ line << name;
+
+ int children = node->nChildren();
+ if (children)
+ line << '/';
+
+ if (!children || (_verbose && node->hasValue())) {
+ if (node->getType() == SGPropertyNode::STRING
+ || node->getType() == SGPropertyNode::UNSPECIFIED)
+ sanitize(value);
+
+ line << " = '" << value << "' (" << type;
+
+ if (_verbose) {
+ stdString ext;
+ if (!node->getAttribute(SGPropertyNode::READ))
+ ext += 'r';
+ if (!node->getAttribute(SGPropertyNode::WRITE))
+ ext += 'w';
+ if (node->getAttribute(SGPropertyNode::TRACE_READ))
+ ext += 'R';
+ if (node->getAttribute(SGPropertyNode::TRACE_WRITE))
+ ext += 'W';
+ if (node->getAttribute(SGPropertyNode::ARCHIVE))
+ ext += 'A';
+ if (node->getAttribute(SGPropertyNode::USERARCHIVE))
+ ext += 'U';
+ if (node->isTied())
+ ext += 'T';
+
+ if (!ext.empty())
+ line << ", " << ext;
+
+ int num = node->nListeners();
+ if (data.listener)
+ num--;
+ if (num)
+ line << ", L" << num;
+ }
+ line << ')';
}
- line += ')';
-
- if (line.size() >= PUSTRING_MAX)
- line.resize(PUSTRING_MAX - 1);
-
- if (_dot_files)
- index += 2;
+ stdString out = line.str();
+ if (out.size() >= PUSTRING_MAX)
+ out.resize(PUSTRING_MAX - 1);
- delete[] _entries[index];
- _entries[index] = new char[line.size() + 1];
- strcpy(_entries[index], line.c_str());
+ delete[] *data.text;
+ *data.text = new char[out.size() + 1];
+ strcpy(*data.text, out.c_str());
}
{
for (int i = 0; i < _num_children; i++)
if (_children[i].node == nd) {
- updateTextForEntry(i);
+ updateTextForEntry(_children[i]);
return;
}
}