don't destroy iterated map entries; delete _menubar; restore closed

[flightgear.git] / src / GUI / new_gui.hxx

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index e0c46837f1ea6c7db8cded6c422269404592ab05..980b7871f86d2420e812f5bcc4a442c82831bdb0 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -16,12 +16,14 @@
 #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>
-SG_USING_STD(vector);
-
 #include <map>
+
+SG_USING_STD(vector);
 SG_USING_STD(map);
+SG_USING_STD(string);
 
 #include <Main/fg_props.hxx>
 
@@ -29,6 +31,7 @@ class FGMenuBar;
 class FGDialog;
 class FGBinding;
 class FGColor;
+class FGFontCache;
 
 
 /**
@@ -130,6 +133,13 @@ public:
      */
     virtual bool closeDialog (const 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 getDialog (const string &name);
+
     /**
      * Return a pointer to the current menubar.
      */
@@ -151,13 +161,27 @@ public:
      */
     virtual FGDialog * getActiveDialog ();
 
-    virtual const FGColor& getColor (const char * which) { return _colors[which]; }
-    virtual const FGColor& getColor (string which) { return _colors[which.c_str()]; }
+    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 {
+        _citt_t it = _colors.find(name.c_str());
+        return (it != _colors.end()) ? it->second : NULL;
+    }
 
     virtual puFont *getDefaultFont() { return &_font; }
 
+
+    /**
+     * menu wide font cache, accessible from other classes as well.
+     */
+    FGFontCache *get_fontcache() { return _fontcache; }
+
 protected:
 
+    FGFontCache * _fontcache;
+
     /**
      * Test if the menubar is visible.
      *
@@ -173,12 +197,21 @@ protected:
     virtual void setMenuBarVisible (bool visible);
 
     virtual void setStyle ();
-    virtual void setupFont ();
+    virtual void setupFont (SGPropertyNode *);
 
 private:
+    struct ltstr
+    {
+        bool operator()(const char* s1, const char* s2) const {
+            return strcmp(s1, s2) < 0;
+        }
+    };
+
     fntTexFont _tex_font;
     puFont _font;
-    map<string,FGColor> _colors;
+    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;
 
     // Free all allocated memory.
     void clear ();
@@ -199,29 +232,23 @@ 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& operator=(const FGColor& c) {
-        _red = c._red;
-        _green = c._green;
-        _blue = c._blue;
-        _alpha = c._alpha;
-        return *this;
+    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 merge(const FGColor *color);
 
     bool set(const SGPropertyNode *prop) { clear(); return merge(prop); };
-    bool set(const FGColor& color) { clear(); return merge(color); }
+    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
-                && _alpha >= 0.0;
+        return _red >= 0.0 && _green >= 0.0 && _blue >= 0.0;
     }
     void print() const {
         std::cerr << "red=" << _red << ", green=" << _green
@@ -236,7 +263,7 @@ public:
     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 clamp(_alpha); }
+    inline float alpha() const { return _alpha < 0.0 ? 1.0 : clamp(_alpha); }
 
 protected:
     float _red, _green, _blue, _alpha;
@@ -246,5 +273,26 @@ private:
 };
 
 
+
+/**
+ * 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:
+    SGPath _path;
+
+    map<const char*,puFont*> _fonts;
+    typedef map<const char*,puFont*>::iterator _itt_t;
+
+public:
+    FGFontCache();
+    ~FGFontCache();
+
+    puFont *get(const char *name, float size=15.0, float slant=0.0);
+    puFont *get(SGPropertyNode *node);
+};
+
+
 #endif // __NEW_GUI_HXX