# include "config.h"
#endif
-#include <Input/input.hxx>
+#include <simgear/structure/SGBinding.hxx>
#include <Scripting/NasalSys.hxx>
#include <Main/fg_os.hxx>
#include "AirportList.hxx"
#include "property_list.hxx"
#include "layout.hxx"
-
+#include "WaypointList.hxx"
+#include "MapWidget.hxx"
enum format_type { f_INVALID, f_INT, f_LONG, f_FLOAT, f_DOUBLE, f_STRING };
static const int FORMAT_BUFSIZE = 255;
+static const int RESIZE_MARGIN = 7;
+
/**
* Makes sure the format matches '%[ -+#]?\d*(\.\d*)?(l?[df]|s)', with
if ((ret = getActiveInputField(obj)))
return ret;
- if (object->getType() & PUCLASS_INPUT && ((puInput *)object)->isAcceptingInput())
+ if (object->getType() & (PUCLASS_INPUT|PUCLASS_LARGEINPUT)
+ && ((puInput *)object)->isAcceptingInput())
return object;
return 0;
*/
int fgPopup::checkHit(int button, int updown, int x, int y)
{
- int result = 1;
+ int result = 0;
if (updown != PU_DRAG && !_dragging)
result = puPopup::checkHit(button, updown, x, y);
int global_resize = fgGetKeyModifiers() & KEYMOD_CTRL;
int hit = getHitObjects(this, x, y);
- if (!global_resize && hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT|PUCLASS_LARGEINPUT))
+ if (hit & PUCLASS_LIST) // ctrl-click in property browser (toggle bool)
+ return result;
+ if (!global_resize && hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT
+ |PUCLASS_LARGEINPUT|PUCLASS_SCROLLBAR))
return result;
getPosition(&_dlgX, &_dlgY);
};
_resizing = 0;
- if (!global_drag) {
- int hmargin = global_resize ? _dlgW / 3 : 10;
- int vmargin = global_resize ? _dlgH / 3 : 10;
+ if (!global_drag && _resizable) {
+ int hmargin = global_resize ? _dlgW / 3 : RESIZE_MARGIN;
+ int vmargin = global_resize ? _dlgH / 3 : RESIZE_MARGIN;
if (y - _dlgY < vmargin)
_resizing |= BOTTOM;
getFirstChild()->setSize(w, h); // dialog background puFrame
}
} else {
- setPosition(x + _dlgX - _startX, y + _dlgY - _startY);
- }
+ int posX = x + _dlgX - _startX,
+ posY = y + _dlgY - _startY;
+ setPosition(posX, posY);
+
+ GUIInfo *info = (GUIInfo *)getUserData();
+ if (info && info->node) {
+ info->node->setIntValue("x", posX);
+ info->node->setIntValue("y", posY);
+ }
+ } // re-positioning
} else if (_dragging) {
fgSetMouseCursor(_start_cursor);
object->setSize(w, h);
}
-\f
////////////////////////////////////////////////////////////////////////
+
+void FGDialog::ConditionalObject::update(FGDialog* aDlg)
+{
+ if (_name == "visible") {
+ bool wasVis = _pu->isVisible();
+ bool newVis = test();
+
+ if (newVis == wasVis) {
+ return;
+ }
+
+ if (newVis) { // puObject needs a setVisible. Oh well.
+ _pu->reveal();
+ } else {
+ _pu->hide();
+ }
+ } else if (_name == "enable") {
+ bool wasEnabled = _pu->isActive();
+ bool newEnable = test();
+
+ if (wasEnabled == newEnable) {
+ return;
+ }
+
+ if (newEnable) {
+ _pu->activate();
+ } else {
+ _pu->greyOut();
+ }
+ }
+
+ aDlg->setNeedsLayout();
+}
+\f////////////////////////////////////////////////////////////////////////
// Callbacks.
////////////////////////////////////////////////////////////////////////
static void
copy_to_pui (SGPropertyNode *node, puObject *object)
{
+ using namespace simgear;
GUIInfo *info = (GUIInfo *)object->getUserData();
if (!info) {
SG_LOG(SG_GENERAL, SG_ALERT, "dialog: widget without GUIInfo!");
}
switch (node->getType()) {
- case SGPropertyNode::BOOL:
- case SGPropertyNode::INT:
- case SGPropertyNode::LONG:
+ case props::BOOL:
+ case props::INT:
+ case props::LONG:
object->setValue(node->getIntValue());
break;
- case SGPropertyNode::FLOAT:
- case SGPropertyNode::DOUBLE:
+ case props::FLOAT:
+ case props::DOUBLE:
object->setValue(node->getFloatValue());
break;
default:
static void
copy_from_pui (puObject *object, SGPropertyNode *node)
{
+ using namespace simgear;
// puText objects are immutable, so should not be copied out
if (object->getType() & PUCLASS_TEXT)
return;
switch (node->getType()) {
- case SGPropertyNode::BOOL:
- case SGPropertyNode::INT:
- case SGPropertyNode::LONG:
+ case props::BOOL:
+ case props::INT:
+ case props::LONG:
node->setIntValue(object->getIntegerValue());
break;
- case SGPropertyNode::FLOAT:
- case SGPropertyNode::DOUBLE:
+ case props::FLOAT:
+ case props::DOUBLE:
node->setFloatValue(object->getFloatValue());
break;
default:
FGDialog::FGDialog (SGPropertyNode *props) :
_object(0),
_gui((NewGUI *)globals->get_subsystem("gui")),
- _props(props)
+ _props(props),
+ _needsRelayout(false)
{
_module = string("__dlg:") + props->getStringValue("name", "[unnamed]");
+
SGPropertyNode *nasal = props->getNode("nasal");
if (nasal) {
_nasal_close = nasal->getNode("close");
if (open) {
const char *s = open->getStringValue();
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
- nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), props);
+ if (nas)
+ nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), props);
}
}
display(props);
_props->setIntValue("lasty", y);
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
- if (_nasal_close) {
- const char *s = _nasal_close->getStringValue();
- nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _props);
+ if (nas) {
+ if (_nasal_close) {
+ const char *s = _nasal_close->getStringValue();
+ nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _props);
+ }
+ nas->deleteModule(_module.c_str());
}
- nas->deleteModule(_module.c_str());
puDeleteObject(_object);
if (objectName && !objectName[0])
objectName = 0;
- for (unsigned int i = 0; i < _propertyObjects.size(); i++) {
- const string &name = _propertyObjects[i]->name;
- if (objectName && name != objectName)
- continue;
-
- puObject *obj = _propertyObjects[i]->object;
- if ((obj->getType() & PUCLASS_LIST) && (dynamic_cast<GUI_ID *>(obj)->id & FGCLASS_LIST)) {
- fgList *pl = static_cast<fgList *>(obj);
- pl->update();
- } else
- copy_to_pui(_propertyObjects[i]->node, obj);
+ for (unsigned int i = 0; i < _propertyObjects.size(); i++) {
+ const string &name = _propertyObjects[i]->name;
+ if (objectName && name != objectName) {
+ continue;
+ }
+
+ puObject *widget = _propertyObjects[i]->object;
+ int widgetType = widget->getType();
+ if (widgetType & PUCLASS_LIST) {
+ GUI_ID* gui_id = dynamic_cast<GUI_ID *>(widget);
+ if (gui_id && (gui_id->id & FGCLASS_LIST)) {
+ fgList *pl = static_cast<fgList*>(widget);
+ pl->update();
+ } else {
+ copy_to_pui(_propertyObjects[i]->node, widget);
+ }
+ } else if (widgetType & PUCLASS_COMBOBOX) {
+ fgComboBox* combo = static_cast<fgComboBox*>(widget);
+ combo->update();
+ } else {
+ copy_to_pui(_propertyObjects[i]->node, widget);
}
+ } // of property objects iteration
}
void
copy_to_pui(_liveObjects[i]->node, obj);
}
+
+ for (unsigned int j=0; j < _conditionalObjects.size(); ++j) {
+ _conditionalObjects[j]->update(this);
+ }
+
+ if (_needsRelayout) {
+ relayout();
+ }
}
void
setupObject(obj, props);
setColor(obj, props);
return obj;
-
+ } else if (type == "map") {
+ MapWidget* mapWidget = new MapWidget(x, y, x + width, y + height);
+ setupObject(mapWidget, props);
+ return mapWidget;
} else if (type == "combo") {
fgComboBox *obj = new fgComboBox(x, y, x + width, y + height, props,
props->getBoolValue("editable", false));
} else if (type == "slider") {
bool vertical = props->getBoolValue("vertical", false);
- puSlider *obj = new puSlider(x, y, (vertical ? height : width));
+ puSlider *obj = new puSlider(x, y, (vertical ? height : width), vertical);
obj->setMinValue(props->getFloatValue("min", 0.0));
obj->setMaxValue(props->getFloatValue("max", 1.0));
+ obj->setStepSize(props->getFloatValue("step"));
+ obj->setSliderFraction(props->getFloatValue("fraction"));
+#if PLIB_VERSION > 185
+ obj->setPageStepSize(props->getFloatValue("pagestep"));
+#endif
setupObject(obj, props);
if (presetSize)
obj->setSize(width, height);
} else if (type == "textbox") {
int slider_width = props->getIntValue("slider", 20);
int wrap = props->getBoolValue("wrap", true);
- puaLargeInput * obj = new puaLargeInput(x, y,
+#if PLIB_VERSION > 185
+ puaLargeInput *obj = new puaLargeInput(x, y,
+ x + width, x + height, 11, slider_width, wrap);
+#else
+ puaLargeInput *obj = new puaLargeInput(x, y,
x + width, x + height, 2, slider_width, wrap);
+#endif
+
+ if (props->getBoolValue("editable"))
+ obj->enableInput();
+ else
+ obj->disableInput();
- if (props->hasValue("editable")) {
- if (props->getBoolValue("editable")==false)
- obj->disableInput();
- else
- obj->enableInput();
- }
if (presetSize)
obj->setSize(width, height);
setupObject(obj, props);
setColor(obj, props, FOREGROUND|LABEL);
+
+ int top = props->getIntValue("top-line", 0);
+ obj->setTopLineInWindow(top < 0 ? unsigned(-1) >> 1 : top);
return obj;
} else if (type == "select") {
setupObject(obj, props);
setColor(obj, props, EDITFIELD);
return obj;
+ } else if (type == "waypointlist") {
+ ScrolledWaypointList* obj = new ScrolledWaypointList(x, y, width, height);
+ setupObject(obj, props);
+ return obj;
} else {
return 0;
}
object->setLabelFont(*_font);
}
+ if (props->hasChild("visible")) {
+ ConditionalObject* cnd = new ConditionalObject("visible", object);
+ cnd->setCondition(sgReadCondition(globals->get_props(), props->getChild("visible")));
+ _conditionalObjects.push_back(cnd);
+ }
+
+ if (props->hasChild("enable")) {
+ ConditionalObject* cnd = new ConditionalObject("enable", object);
+ cnd->setCondition(sgReadCondition(globals->get_props(), props->getChild("enable")));
+ _conditionalObjects.push_back(cnd);
+ }
+
+ string type = props->getName();
+ if (type == "input" && props->getBoolValue("live"))
+ object->setDownCallback(action_callback);
+
+ if (type == "text") {
+ const char *format = props->getStringValue("format", 0);
+ if (format) {
+ info->fmt_type = validate_format(format);
+ if (info->fmt_type != f_INVALID)
+ info->format = format;
+ else
+ SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
+ << format << '\'');
+ }
+ }
+
if (props->hasValue("property")) {
const char *name = props->getStringValue("name");
if (name == 0)
name = "";
const char *propname = props->getStringValue("property");
SGPropertyNode_ptr node = fgGetNode(propname, true);
- copy_to_pui(node, object);
+ if (type == "map") {
+ // mapWidget binds to a sub-tree of properties, and
+ // ignroes the puValue mechanism, so special case things here
+ MapWidget* mw = static_cast<MapWidget*>(object);
+ mw->setProperty(node);
+ } else {
+ // normal widget, creating PropertyObject
+ copy_to_pui(node, object);
+ PropertyObject *po = new PropertyObject(name, object, node);
+ _propertyObjects.push_back(po);
+ if (props->getBoolValue("live"))
+ _liveObjects.push_back(po);
+ }
+
- PropertyObject *po = new PropertyObject(name, object, node);
- _propertyObjects.push_back(po);
- if (props->getBoolValue("live"))
- _liveObjects.push_back(po);
}
SGPropertyNode *dest = fgGetNode("/sim/bindings/gui", true);
}
object->setCallback(action_callback);
}
-
- string type = props->getName();
- if (type == "input" && props->getBoolValue("live"))
- object->setDownCallback(action_callback);
-
- if (type == "text") {
- const char *format = props->getStringValue("format", 0);
- if (format) {
- info->fmt_type = validate_format(format);
- if (info->fmt_type != f_INVALID)
- info->format = format;
- else
- SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
- << format << '\'');
- }
- }
}
void
key = toupper(key);
if (mod & CTRL)
key = toupper(key) - '@';
- if (mod & ALT)
+ /* if (mod & ALT)
; // Alt not propagated to the gui
+ */
} else {
for (char *t = s; *t; t++)
*t = tolower(*t);
return key;
}
+void\fFGDialog::relayout()
+{
+ _needsRelayout = false;
+
+ int screenw = globals->get_props()->getIntValue("/sim/startup/xsize");
+ int screenh = globals->get_props()->getIntValue("/sim/startup/ysize");
+
+ bool userx = _props->hasValue("x");
+ bool usery = _props->hasValue("y");
+ bool userw = _props->hasValue("width");
+ bool userh = _props->hasValue("height");
+
+ // Let the layout widget work in the same property subtree.
+ LayoutWidget wid(_props);
+ wid.setDefaultFont(_font, int(_font->getPointSize()));
+
+ int pw = 0, ph = 0;
+ int px, py, savex, savey;
+ if (!userw || !userh) {
+ wid.calcPrefSize(&pw, &ph);
+ }
+
+ pw = _props->getIntValue("width", pw);
+ ph = _props->getIntValue("height", ph);
+ px = savex = _props->getIntValue("x", (screenw - pw) / 2);
+ py = savey = _props->getIntValue("y", (screenh - ph) / 2);
+
+ // Negative x/y coordinates are interpreted as distance from the top/right
+ // corner rather than bottom/left.
+ if (userx && px < 0)
+ px = screenw - pw + px;
+ if (usery && py < 0)
+ py = screenh - ph + py;
+
+ // Define "x", "y", "width" and/or "height" in the property tree if they
+ // are not specified in the configuration file.
+ wid.layout(px, py, pw, ph);
+
+ applySize(_object);
+
+ // Remove automatically generated properties, so the layout looks
+ // the same next time around, or restore x and y to preserve negative coords.
+ if (userx)
+ _props->setIntValue("x", savex);
+ else
+ _props->removeChild("x");
+
+ if (usery)
+ _props->setIntValue("y", savey);
+ else
+ _props->removeChild("y");
+
+ if (!userw) _props->removeChild("width");
+ if (!userh) _props->removeChild("height");
+}
+
+void
+FGDialog::applySize(puObject *object)
+{
+ // compound plib widgets use setUserData() for internal purposes, so refuse
+ // to descend into anything that has other bits set than the following
+ const int validUserData = PUCLASS_VALUE|PUCLASS_OBJECT|PUCLASS_GROUP|PUCLASS_INTERFACE
+ |PUCLASS_FRAME|PUCLASS_TEXT|PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT
+ |PUCLASS_ARROW|PUCLASS_DIAL|PUCLASS_POPUP;
+
+ int type = object->getType();
+ if ((type & PUCLASS_GROUP) && !(type & ~validUserData)) {
+ puObject* c = ((puGroup *)object)->getFirstChild();
+ for (; c != NULL; c = c->getNextObject()) {
+ applySize(c);
+ } // of child iteration
+ } // of group object case
+
+ GUIInfo *info = (GUIInfo *)object->getUserData();
+ if (!info)
+ return;
+
+ SGPropertyNode *n = info->node;
+ if (!n) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "FGDialog::applySize: no props");
+ return;
+ }
+
+ int x = n->getIntValue("x");
+ int y = n->getIntValue("y");
+ int w = n->getIntValue("width", 4);
+ int h = n->getIntValue("height", 4);
+ object->setPosition(x, y);
+ object->setSize(w, h);
+}
-\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGDialog::PropertyObject.
////////////////////////////////////////////////////////////////////////
void
fgValueList::make_list()
{
- vector<SGPropertyNode_ptr> value_nodes = _props->getChildren("value");
- _list = new char *[value_nodes.size() + 1];
- unsigned int i;
- for (i = 0; i < value_nodes.size(); i++)
- _list[i] = strdup((char *)value_nodes[i]->getStringValue());
- _list[i] = 0;
+ SGPropertyNode_ptr values = _props;
+ const char* vname = "value";
+
+ if (_props->hasChild("properties")) {
+ // dynamic values, read from a property's children
+ const char* path = _props->getStringValue("properties");
+ values = fgGetNode(path, true);
+ }
+
+ if (_props->hasChild("property-name")) {
+ vname = _props->getStringValue("property-name");
+ }
+
+ vector<SGPropertyNode_ptr> value_nodes = values->getChildren(vname);
+ _list = new char *[value_nodes.size() + 1];
+ unsigned int i;
+ for (i = 0; i < value_nodes.size(); i++) {
+ _list[i] = strdup((char *)value_nodes[i]->getStringValue());
+ }
+ _list[i] = 0;
}
void
setTopItem(top);
}
+void fgComboBox::update()
+{
+ fgValueList::update();
+ newList(_list);
+}
+
// end of dialog.cxx
projects / flightgear.git / blobdiff