#ifndef __NEW_GUI_HXX
#define __NEW_GUI_HXX 1
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <plib/pu.h>
-
-#include <simgear/compiler.h> // for SG_USING_STD
#include <simgear/props/props.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/misc/sg_path.hxx>
#include <vector>
#include <map>
-
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
-
-#include <Main/fg_props.hxx>
+#include <memory> // for auto_ptr on some systems
+#include <cstring> // for strcmp in lstr() (in this header, alas)
class FGMenuBar;
class FGDialog;
-class FGBinding;
class FGColor;
class FGFontCache;
-
+class puFont;
/**
* XML-configured GUI subsystem.
*/
virtual void init ();
+ virtual void shutdown ();
+
/**
* Reinitialize the GUI subsystem. Reloads all XML dialogs.
*/
* @param name The name of the dialog box.
* @return true if the dialog exists, false otherwise.
*/
- virtual bool showDialog (const string &name);
+ virtual bool showDialog (const std::string &name);
/**
* @param name The name of the dialog box.
* @return true if the dialog was active, false otherwise.
*/
- virtual bool closeDialog (const string &name);
+ virtual bool closeDialog (const std::string &name);
/**
* Get dialog property tree's root node.
* @param name The name of the dialog box.
* @return node pointer if the dialog was found, zero otherwise.
*/
- virtual SGPropertyNode_ptr getDialogProperties (const string &name);
+ virtual SGPropertyNode_ptr getDialogProperties (const std::string &name);
/**
* Return a pointer to the current menubar.
*
* @return The named dialog, or 0 if it isn't active.
*/
- virtual FGDialog * getDialog (const string &name);
+ virtual FGDialog * getDialog (const std::string &name);
virtual FGColor *getColor (const char * name) const {
_citt_t it = _colors.find(name);
return (it != _colors.end()) ? it->second : NULL;
}
- virtual FGColor *getColor (const string &name) const {
+ virtual FGColor *getColor (const std::string &name) const {
_citt_t it = _colors.find(name.c_str());
return (it != _colors.end()) ? it->second : NULL;
}
virtual void reset (bool reload);
private:
+ void createMenuBarImplementation();
+
struct ltstr
{
bool operator()(const char* s1, const char* s2) const {
};
puFont *_font;
- map<const char*,FGColor*, ltstr> _colors;
- typedef map<const char*,FGColor*, ltstr>::iterator _itt_t;
- typedef map<const char*,FGColor*, ltstr>::const_iterator _citt_t;
+ typedef std::map<const char*,FGColor*, ltstr> ColourDict;
+ ColourDict _colors;
+ typedef ColourDict::iterator _itt_t;
+ typedef ColourDict::const_iterator _citt_t;
void clear_colors();
// Read all the configuration files in a directory.
- void readDir (const char * path);
+ void readDir (const SGPath& path);
- FGMenuBar * _menubar;
+ std::auto_ptr<FGMenuBar> _menubar;
FGDialog * _active_dialog;
- map<string,FGDialog *> _active_dialogs;
- map<string,SGPropertyNode_ptr> _dialog_props;
-
-};
-
-
-class FGColor {
-public:
- FGColor() { clear(); }
- FGColor(float r, float g, float b, float a = 1.0f) { set(r, g, b, a); }
- FGColor(const SGPropertyNode *prop) { set(prop); }
- FGColor(FGColor *c) {
- if (c) set(c->_red, c->_green, c->_blue, c->_alpha);
- }
-
- inline void clear() { _red = _green = _blue = _alpha = -1.0f; }
- // merges in non-negative components from property with children <red> etc.
- bool merge(const SGPropertyNode *prop);
- bool merge(const FGColor *color);
-
- bool set(const SGPropertyNode *prop) { clear(); return merge(prop); };
- bool set(const FGColor *color) { clear(); return merge(color); }
- bool set(float r, float g, float b, float a = 1.0f) {
- _red = r, _green = g, _blue = b, _alpha = a;
- return true;
- }
- bool isValid() const {
- return _red >= 0.0 && _green >= 0.0 && _blue >= 0.0;
- }
- void print() const {
- std::cerr << "red=" << _red << ", green=" << _green
- << ", blue=" << _blue << ", alpha=" << _alpha << std::endl;
- }
-
- inline void setRed(float red) { _red = red; }
- inline void setGreen(float green) { _green = green; }
- inline void setBlue(float blue) { _blue = blue; }
- inline void setAlpha(float alpha) { _alpha = alpha; }
-
- inline float red() const { return clamp(_red); }
- inline float green() const { return clamp(_green); }
- inline float blue() const { return clamp(_blue); }
- inline float alpha() const { return _alpha < 0.0 ? 1.0 : clamp(_alpha); }
-
-protected:
- float _red, _green, _blue, _alpha;
-
-private:
- float clamp(float f) const { return f < 0.0 ? 0.0 : f > 1.0 ? 1.0 : f; }
-};
-
-
-
-/**
- * A small class to keep all fonts available for future use.
- * This also assures a font isn't resident more than once.
- */
-class FGFontCache {
-private:
- struct fnt {
- fnt(puFont *pu = 0) : pufont(pu), texfont(0) {}
- ~fnt() { delete pufont; delete texfont; }
- puFont *pufont;
- fntTexFont *texfont;
- };
- SGPath _path;
-
- map<const string,fnt *> _fonts;
- typedef map<const string,fnt *>::const_iterator _itt_t;
- bool _initialized;
-
-public:
- FGFontCache();
- ~FGFontCache();
+ typedef std::map<std::string,FGDialog *> DialogDict;
+ DialogDict _active_dialogs;
+
+ typedef std::map<std::string, SGPath> NamePathDict;
+ // mapping from dialog names to the corresponding XML property list
+ // which defines them
+ NamePathDict _dialog_names;
+
+ // cache of loaded dialog proeprties
+ typedef std::map<std::string,SGPropertyNode_ptr> NameDialogDict;
+ NameDialogDict _dialog_props;
- puFont *get(const char *name, float size=15.0, float slant=0.0);
- puFont *get(SGPropertyNode *node);
};
projects / flightgear.git / blobdiff