# include "config.h"
#endif
-#include <stdlib.h> // atof()
-
#include <Input/input.hxx>
#include <Scripting/NasalSys.hxx>
#include "dialog.hxx"
#include "new_gui.hxx"
-
#include "AirportList.hxx"
#include "property_list.hxx"
#include "layout.hxx"
+enum format_type { f_INVALID, f_INT, f_LONG, f_FLOAT, f_DOUBLE, f_STRING };
static const int FORMAT_BUFSIZE = 255;
/**
- * Makes sure the format matches '[ -+#]?\d*(\.\d*)?l?[fs]', with only
- * one number or string placeholder and otherwise arbitrary prefix and
- * postfix. Return value: 0 .. number, 1 .. string, -1 .. invalid
+ * Makes sure the format matches '%[ -+#]?\d*(\.\d*)?(l?[df]|s)', with
+ * only one number or string placeholder and otherwise arbitrary prefix
+ * and postfix containing only quoted percent signs (%%).
*/
-static int
-validate_format(const char *format)
+static format_type
+validate_format(const char *f)
{
- const int INVALID = -1;
- const char *f = format;
- bool is_number, l = false;
+ bool l = false;
+ format_type type;
for (; *f; f++) {
if (*f == '%') {
if (f[1] == '%')
}
}
if (*f++ != '%')
- return INVALID;
- if (*f == ' ' || *f == '+' || *f == '-' || *f == '#')
+ return f_INVALID;
+ while (*f == ' ' || *f == '+' || *f == '-' || *f == '#' || *f == '0')
f++;
while (*f && isdigit(*f))
f++;
while (*f && isdigit(*f))
f++;
}
+
if (*f == 'l')
l = true, f++;
- if (*f == 'f')
- is_number = true;
+ if (*f == 'd') {
+ type = l ? f_LONG : f_INT;
+ } else if (*f == 'f')
+ type = l ? f_DOUBLE : f_FLOAT;
else if (*f == 's') {
if (l)
- return INVALID;
- is_number = false;
+ return f_INVALID;
+ type = f_STRING;
} else
- return INVALID;
+ return f_INVALID;
for (++f; *f; f++) {
if (*f == '%') {
if (f[1] == '%')
f++;
else
- return INVALID;
+ return f_INVALID;
}
}
- return is_number ? 0 : 1;
+ return type;
}
*/
struct GUIInfo
{
- GUIInfo (FGDialog * d);
- virtual ~GUIInfo ();
+ GUIInfo(FGDialog * d);
+ virtual ~GUIInfo();
+ char *format(SGPropertyNode *);
FGDialog * dialog;
vector <SGBinding *> bindings;
int key;
char *text;
- char *format;
- bool format_for_string;
+ char *fmt_string;
+ format_type fmt_type;
};
GUIInfo::GUIInfo (FGDialog * d)
: dialog(d),
key(-1),
text(0),
- format(0),
- format_for_string(false)
+ fmt_string(0),
+ fmt_type(f_INVALID)
{
}
bindings[i] = 0;
}
delete [] text;
- delete [] format;
+ delete [] fmt_string;
+}
+
+char *GUIInfo::format(SGPropertyNode *n)
+{
+ if (fmt_type == f_INT)
+ snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getIntValue());
+ else if (fmt_type == f_LONG)
+ snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getLongValue());
+ else if (fmt_type == f_FLOAT)
+ snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getFloatValue());
+ else if (fmt_type == f_DOUBLE)
+ snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getDoubleValue());
+ else
+ snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getStringValue());
+
+ text[FORMAT_BUFSIZE] = '\0';
+ return text;
}
puObject *fgPopup::getKeyObject(puObject *object, int key)
{
puObject *ret;
- if(object->getType() & PUCLASS_GROUP)
+ if (object->getType() & PUCLASS_GROUP)
for (puObject *obj = ((puGroup *)object)->getFirstChild();
obj; obj = obj->getNextObject())
if ((ret = getKeyObject(obj, key)))
puObject *fgPopup::getActiveInputField(puObject *object)
{
puObject *ret;
- if(object->getType() & PUCLASS_GROUP)
+ if (object->getType() & PUCLASS_GROUP)
for (puObject *obj = ((puGroup *)object)->getFirstChild();
obj; obj = obj->getNextObject())
if ((ret = getActiveInputField(obj)))
{
int result = puPopup::checkHit(button, updown, x, y);
- if ( !_draggable)
+ if (!_draggable)
return result;
// This is annoying. We would really want a true result from the
// intersection test (again) to make sure we don't start a drag
// when inside controls.
- if(updown == PU_DOWN && !_dragging) {
- if(!result)
+ if (updown == PU_DOWN && !_dragging) {
+ if (!result)
return 0;
int hit = getHitObjects(this, x, y);
- if(hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT))
+ if (hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT))
return result;
int px, py;
_dragging = true;
_dX = px - x;
_dY = py - y;
- } else if(updown == PU_DRAG && _dragging) {
+ } else if (updown == PU_DRAG && _dragging) {
setPosition(x + _dX, y + _dY);
} else {
_dragging = false;
return 0;
int type = 0;
- if(object->getType() & PUCLASS_GROUP)
+ if (object->getType() & PUCLASS_GROUP)
for (puObject *obj = ((puGroup *)object)->getFirstChild();
obj; obj = obj->getNextObject())
type |= getHitObjects(obj, x, y);
int cx, cy, cw, ch;
object->getAbsolutePosition(&cx, &cy);
object->getSize(&cw, &ch);
- if(x >= cx && x < cx + cw && y >= cy && y < cy + ch)
+ if (x >= cx && x < cx + cw && y >= cy && y < cy + ch)
type |= object->getType();
return type;
}
{
// Treat puText objects specially, so their "values" can be set
// from properties.
- if(object->getType() & PUCLASS_TEXT) {
+ if (object->getType() & PUCLASS_TEXT) {
GUIInfo *info = (GUIInfo *)object->getUserData();
- if(info && info->format) {
- if(info->format_for_string)
- snprintf(info->text, FORMAT_BUFSIZE, info->format, node->getStringValue());
- else
- snprintf(info->text, FORMAT_BUFSIZE, info->format, node->getDoubleValue());
- info->text[FORMAT_BUFSIZE] = '\0';
- object->setLabel(info->text);
-
- } else {
+ if (info && info->fmt_string)
+ object->setLabel(info->format(node));
+ else
object->setLabel(node->getStringValue());
- }
return;
}
copy_from_pui (puObject * object, SGPropertyNode * node)
{
// puText objects are immutable, so should not be copied out
- if(object->getType() & PUCLASS_TEXT)
+ if (object->getType() & PUCLASS_TEXT)
return;
switch (node->getType()) {
node->setFloatValue(object->getFloatValue());
break;
default:
- // Special case to handle lists, as getStringValue cannot be overridden
- if(object->getType() & PUCLASS_LIST)
- {
- const char *s = ((puList *) object)->getListStringValue();
- if (s)
- node->setStringValue(s);
- }
- else
- {
- node->setStringValue(object->getStringValue());
- }
+ const char *s = object->getStringValue();
+ if (s)
+ node->setStringValue(s);
break;
}
}
puObject *
FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
{
- if (props->getBoolValue("hide"))
+ if (!props->getBoolValue("enabled", true))
return 0;
bool presetSize = props->hasValue("width") && props->hasValue("height");
fgComboBox * obj = new fgComboBox(x, y, x + width, y + height, props,
props->getBoolValue("editable", false));
setupObject(obj, props);
-#ifdef PUCOL_EDITFIELD // plib > 0.8.4
setColor(obj, props, EDITFIELD);
-#else
- setColor(obj, props, FOREGROUND|LABEL);
-#endif
return obj;
} else if (type == "slider") {
} else if (type == "select") {
fgSelectBox * obj = new fgSelectBox(x, y, x + width, y + height, props);
setupObject(obj, props);
-#ifdef PUCOL_EDITFIELD // plib > 0.8.4
setColor(obj, props, EDITFIELD);
-#else
- setColor(obj, props, FOREGROUND|LABEL);
-#endif
return obj;
} else {
return 0;
PropertyObject* po = new PropertyObject(name, object, node);
_propertyObjects.push_back(po);
- if(props->getBoolValue("live"))
+ if (props->getBoolValue("live"))
_liveObjects.push_back(po);
}
for (unsigned int i = 0; i < bindings.size(); i++) {
unsigned int j = 0;
- SGPropertyNode *binding;
+ SGPropertyNode_ptr binding;
while (dest->getChild("binding", j))
j++;
if (type == "text") {
const char *format = props->getStringValue("format", 0);
if (format) {
- int type = validate_format(props->getStringValue("format", 0));
- if (type >= 0) {
- info->format = new char[strlen(format) + 1];
- strcpy(info->format, format);
- info->format_for_string = type == 1;
+ info->fmt_type = validate_format(props->getStringValue("format", 0));
+ if (info->fmt_type != f_INVALID) {
info->text = new char[FORMAT_BUFSIZE + 1];
+ info->fmt_string = new char[strlen(format) + 1];
+ strcpy(info->fmt_string, format);
+ } else {
+ SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
+ << format << '\'');
}
}
}
if (type == "textbox" && props->getBoolValue("editable"))
type += "-editable";
- FGColor *c = new FGColor(_gui->getColor("background"));
- c->merge(_gui->getColor(type));
- c->merge(props->getNode("color"));
- if (c->isValid())
- object->setColourScheme(c->red(), c->green(), c->blue(), c->alpha());
+ FGColor c(_gui->getColor("background"));
+ c.merge(_gui->getColor(type));
+ c.merge(props->getNode("color"));
+ if (c.isValid())
+ object->setColourScheme(c.red(), c.green(), c.blue(), c.alpha());
const struct {
int mask;
{ LABEL, PUCOL_LABEL, "label", "color-label" },
{ LEGEND, PUCOL_LEGEND, "legend", "color-legend" },
{ MISC, PUCOL_MISC, "misc", "color-misc" },
-#ifdef PUCOL_EDITFIELD // plib > 0.8.4
{ EDITFIELD, PUCOL_EDITFIELD, "editfield", "color-editfield" },
-#endif
};
const int numcol = sizeof(pucol) / sizeof(pucol[0]);
for (int i = 0; i < numcol; i++) {
bool dirty = false;
- c->clear();
- c->setAlpha(1.0);
+ c.clear();
+ c.setAlpha(1.0);
- dirty |= c->merge(_gui->getColor(type + '-' + pucol[i].name));
+ dirty |= c.merge(_gui->getColor(type + '-' + pucol[i].name));
if (which & pucol[i].mask)
- dirty |= c->merge(props->getNode("color"));
+ dirty |= c.merge(props->getNode("color"));
- if ((pucol[i].mask == LABEL) && !c->isValid())
- dirty |= c->merge(_gui->getColor("label"));
+ if ((pucol[i].mask == LABEL) && !c.isValid())
+ dirty |= c.merge(_gui->getColor("label"));
- dirty |= c->merge(props->getNode(pucol[i].cname));
+ dirty |= c.merge(props->getNode(pucol[i].cname));
- if (c->isValid() && dirty)
- object->setColor(pucol[i].id, c->red(), c->green(), c->blue(), c->alpha());
+ if (c.isValid() && dirty)
+ object->setColor(pucol[i].id, c.red(), c.green(), c.blue(), c.alpha());
}
}
fgList::update()
{
fgValueList::update();
+ int top = getTopItem();
newList(_list);
+ setTopItem(top);
}
// end of dialog.cxx
projects / flightgear.git / blobdiff