#include <plib/pu.h>
#include <plib/ul.h>
-#include <vector>
-SG_USING_STD(vector);
+#include <simgear/compiler.h>
+#include <simgear/structure/exception.hxx>
-#include <simgear/misc/exception.hxx>
#include <Main/fg_props.hxx>
+#include "menubar.hxx"
+#include "dialog.hxx"
-/**
- * Callback to update all property values.
- */
-static void
-update_callback (puObject * object)
-{
- ((NewGUI *)object->getUserData())->updateProperties();
-}
+SG_USING_STD(map);
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of NewGUI.
+////////////////////////////////////////////////////////////////////////
-/**
- * Callback to close the dialog.
- */
-static void
-close_callback (puObject * object)
+NewGUI::NewGUI ()
+ : _menubar(new FGMenuBar),
+ _active_dialog(0)
{
- ((NewGUI *)object->getUserData())->closeActiveObject();
}
-
-/**
- * Callback to apply the property value for every field.
- */
-static void
-apply_callback (puObject * object)
+NewGUI::~NewGUI ()
{
- ((NewGUI *)object->getUserData())->applyProperties();
- update_callback(object);
+ clear();
}
-
-/**
- * Callback to apply the property values and close the dialog.
- */
-static void
-close_apply_callback (puObject * object)
+void
+NewGUI::init ()
{
- apply_callback(object);
- close_callback(object);
+ char path1[1024];
+ char path2[1024];
+ ulMakePath(path1, globals->get_fg_root().c_str(), "gui");
+ ulMakePath(path2, path1, "dialogs");
+ readDir(path2);
+ _menubar->init();
}
-
-
-NewGUI::NewGUI ()
- : _activeObject(0)
+void
+NewGUI::reinit ()
{
+ unbind();
+ clear();
+ _menubar = new FGMenuBar;
+ init();
+ bind();
}
-NewGUI::~NewGUI ()
+void
+NewGUI::bind ()
{
+ fgTie("/sim/menubar/visibility", this,
+ &NewGUI::getMenuBarVisible, &NewGUI::setMenuBarVisible);
}
void
-NewGUI::init ()
+NewGUI::unbind ()
{
- char path[1024];
- ulMakePath(path, getenv("FG_ROOT"), "gui");
- std::cerr << "Reading from " << path << std::endl;
- readDir(path);
- std::cerr << "Done reading from " << path << std::endl;
+ fgUntie("/sim/menubar/visibility");
}
void
NewGUI::update (double delta_time_sec)
{
- // NO OP
+ map<string,FGDialog *>::iterator iter = _active_dialogs.begin();
+ for(/**/; iter != _active_dialogs.end(); iter++)
+ iter->second->update();
}
-void
-NewGUI::display (const string &name)
+bool
+NewGUI::showDialog (const string &name)
{
- if (_activeObject != 0) {
- SG_LOG(SG_GENERAL, SG_ALERT, "Another GUI object is still active");
- return;
+ if (_dialog_props.find(name) == _dialog_props.end()) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "Dialog " << name << " not defined");
+ return false;
+ } else {
+ if(!_active_dialogs[name])
+ _active_dialogs[name] = new FGDialog(_dialog_props[name]);
+ return true;
}
+}
- if (_objects.find(name) == _objects.end()) {
- SG_LOG(SG_GENERAL, SG_ALERT, "Dialog " << name << " not defined");
- return;
+bool
+NewGUI::closeActiveDialog ()
+{
+ if (_active_dialog == 0)
+ return false;
+
+ // Kill any entries in _active_dialogs... Is there an STL
+ // algorithm to do (delete map entries by value, not key)? I hate
+ // the STL :) -Andy
+ map<string,FGDialog *>::iterator iter = _active_dialogs.begin();
+ for(/**/; iter != _active_dialogs.end(); iter++) {
+ if(iter->second == _active_dialog) {
+ _active_dialogs.erase(iter);
+ // iter is no longer valid
+ break;
+ }
}
- SGPropertyNode_ptr props = _objects[name];
-
- _activeObject = makeObject(props, 1024, 768);
- if (_activeObject != 0) {
- _activeObject->reveal();
- } else {
- SG_LOG(SG_GENERAL, SG_ALERT, "Dialog " << name
- << " does not contain a proper GUI definition");
+ delete _active_dialog;
+ _active_dialog = 0;
+ return true;
+}
+
+bool
+NewGUI::closeDialog (const string& name)
+{
+ if(_active_dialogs.find(name) != _active_dialogs.end()) {
+ if(_active_dialog == _active_dialogs[name])
+ _active_dialog = 0;
+ delete _active_dialogs[name];
+ _active_dialogs.erase(name);
+ return true;
}
+ return false; // dialog wasn't open...
}
void
-NewGUI::applyProperties ()
+NewGUI::setActiveDialog (FGDialog * dialog)
{
- for (int i = 0; i < _propertyObjects.size(); i++) {
- puObject * object = _propertyObjects[i].object;
- SGPropertyNode_ptr node = _propertyObjects[i].node;
- node->setStringValue(object->getStringValue());
- }
+ _active_dialog = dialog;
+}
+
+FGDialog *
+NewGUI::getActiveDialog ()
+{
+ return _active_dialog;
+}
+
+FGMenuBar *
+NewGUI::getMenuBar ()
+{
+ return _menubar;
+}
+
+bool
+NewGUI::getMenuBarVisible () const
+{
+ return _menubar->isVisible();
+}
+
+void
+NewGUI::setMenuBarVisible (bool visible)
+{
+ if (visible)
+ _menubar->show();
+ else
+ _menubar->hide();
}
void
-NewGUI::updateProperties ()
+NewGUI::clear ()
{
- for (int i = 0; i < _propertyObjects.size(); i++) {
- puObject * object = _propertyObjects[i].object;
- SGPropertyNode_ptr node = _propertyObjects[i].node;
- object->setValue(node->getStringValue());
+ delete _menubar;
+ _menubar = 0;
+ _dialog_props.clear();
+}
+
+static bool
+test_extension (const char * path, const char * ext)
+{
+ int pathlen = strlen(path);
+ int extlen = strlen(ext);
+
+ for (int i = 1; i <= pathlen && i <= extlen; i++) {
+ if (path[pathlen-i] != ext[extlen-i])
+ return false;
}
+ return true;
}
void
-NewGUI::closeActiveObject ()
+NewGUI::newDialog (SGPropertyNode* props)
{
- delete _activeObject;
- _activeObject = 0;
- _propertyObjects.clear();
+ const char* cname = props->getStringValue("name");
+ if(!cname) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "New dialog has no <name> property");
+ return;
+ }
+ string name = cname;
+ if(!_active_dialogs[name])
+ _dialog_props[name] = props;
}
void
NewGUI::readDir (const char * path)
{
ulDir * dir = ulOpenDir(path);
- std::cerr << "Directory opened successfully" << std::endl;
if (dir == 0) {
SG_LOG(SG_GENERAL, SG_ALERT, "Failed to read GUI files from "
return;
}
- ulDirEnt * dirEnt = ulReadDir(dir);
- while (dirEnt != 0) {
+ for (ulDirEnt * dirEnt = ulReadDir(dir);
+ dirEnt != 0;
+ dirEnt = ulReadDir(dir)) {
+
char subpath[1024];
ulMakePath(subpath, path, dirEnt->d_name);
- std::cerr << "Subpath is " << subpath << std::endl;
- if (dirEnt->d_isdir && dirEnt->d_name[0] != '.') {
- readDir(subpath);
- } else {
- SGPropertyNode_ptr props = new SGPropertyNode;
+ if (!dirEnt->d_isdir && test_extension(subpath, ".xml")) {
+ SGPropertyNode * props = new SGPropertyNode;
try {
readProperties(subpath, props);
- } catch (const sg_exception &ex) {
- SG_LOG(SG_INPUT, SG_ALERT, "Error parsing GUI file "
+ } catch (const sg_exception &) {
+ SG_LOG(SG_INPUT, SG_ALERT, "Error parsing dialog "
<< subpath);
+ delete props;
+ continue;
}
- if (!props->hasValue("name")) {
- SG_LOG(SG_INPUT, SG_WARN, "GUI file " << subpath
+ SGPropertyNode *nameprop = props->getNode("name");
+ if (!nameprop) {
+ SG_LOG(SG_INPUT, SG_WARN, "dialog " << subpath
<< " has no name; skipping.");
- } else {
- string name = props->getStringValue("name");
- SG_LOG(SG_INPUT, SG_BULK, "Saving GUI node " << name);
- _objects[name] = props;
+ delete props;
+ continue;
}
+ string name = nameprop->getStringValue();
+ if (_dialog_props[name])
+ delete (SGPropertyNode *)_dialog_props[name];
+
+ _dialog_props[name] = props;
}
- dirEnt = ulReadDir(dir);
}
ulCloseDir(dir);
}
-puObject *
-NewGUI::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
-{
- int width = props->getIntValue("width", parentWidth);
- int height = props->getIntValue("height", parentHeight);
-
- int x = props->getIntValue("x", (parentWidth - width) / 2);
- int y = props->getIntValue("y", (parentHeight - height) / 2);
-
- string type = props->getName();
- if (type == "")
- type = props->getStringValue("type");
- if (type == "") {
- SG_LOG(SG_GENERAL, SG_ALERT, "No type specified for GUI object");
- return 0;
- }
-
- if (type == "dialog") {
- puPopup * dialog;
- if (props->getBoolValue("modal", false))
- dialog = new puDialogBox(x, y);
- else
- dialog = new puPopup(x, y);
- setupGroup(dialog, props, width, height, true);
- return dialog;
- } else if (type == "group") {
- puGroup * group = new puGroup(x, y);
- setupGroup(group, props, width, height, false);
- return group;
- } else if (type == "input") {
- puInput * input = new puInput(x, y, x + width, y + height);
- setupObject(input, props);
- return input;
- } else if (type == "text") {
- puText * text = new puText(x, y);
- setupObject(text, props);
- return text;
- } else if (type == "button") {
- puButton * b;
- const char * legend = props->getStringValue("legend", "[none]");
- if (props->getBoolValue("one-shot", true))
- b = new puOneShot(x, y, legend);
- else
- b = new puButton(x, y, legend);
- setupObject(b, props);
- return b;
- } else {
- return 0;
- }
-}
-
-void
-NewGUI::setupObject (puObject * object, SGPropertyNode * props)
-{
- object->setUserData(this);
-
- if (props->hasValue("legend"))
- object->setLegend(props->getStringValue("legend"));
-
- if (props->hasValue("label"))
- object->setLabel(props->getStringValue("label"));
-
- if (props->hasValue("default-value-prop")) {
- const char * name = props->getStringValue("default-value-prop");
- SGPropertyNode_ptr node = fgGetNode(name, true);
- object->setValue(node->getStringValue());
- _propertyObjects.push_back(PropertyObject(object, node));
- }
-
- if (props->hasValue("action")) {
- string action = props->getStringValue("action");
- if (action == "update")
- object->setCallback(update_callback);
- else if (action == "close")
- object->setCallback(close_callback);
- else if (action == "apply")
- object->setCallback(apply_callback);
- else if (action == "close-apply")
- object->setCallback(close_apply_callback);
- else
- SG_LOG(SG_GENERAL, SG_ALERT, "Unknown GUI action " + action);
- }
-
- object->makeReturnDefault(props->getBoolValue("default"));
-}
-
-void
-NewGUI::setupGroup (puGroup * group, SGPropertyNode * props,
- int width, int height, bool makeFrame)
-{
- setupObject(group, props);
-
- if (makeFrame)
- new puFrame(0, 0, width, height);
-
- int nChildren = props->nChildren();
- for (int i = 0; i < nChildren; i++)
- makeObject(props->getChild(i), width, height);
- group->close();
-}
-
-NewGUI::PropertyObject::PropertyObject (puObject * o, SGPropertyNode_ptr n)
- : object(o),
- node(n)
-{
-}
-
// end of new_gui.cxx
projects / flightgear.git / blobdiff