X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fnew_gui.hxx;h=6bc2707157eec18780bbf377ecab6b9441d24a75;hb=fc71333bdd0217a9ff4880305daf6d4d10fb0b40;hp=76aca62fbda2637afbd24a445253435d61a8559f;hpb=cff9e518403376c4b11d8fc9002a352b58d1a93b;p=flightgear.git

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 76aca62fb..6bc270715 100644
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -18,18 +18,20 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+#include <functional>
 #include <vector>
 #include <map>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::vector;
+using std::map;
+using std::string;
 
 #include <Main/fg_props.hxx>
 
+class SGBinding;
+
 class FGMenuBar;
 class FGDialog;
-class FGBinding;
 class FGColor;
 class FGFontCache;
 
@@ -143,7 +145,7 @@ public:
      * @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);
+    virtual SGPropertyNode_ptr getDialogProperties (const string &name);
 
     /**
      * Return a pointer to the current menubar.
@@ -165,6 +167,15 @@ public:
      */
     virtual FGDialog * getActiveDialog ();
 
+
+    /**
+     * Get the named dialog if active.
+     *
+     * @return The named dialog, or 0 if it isn't active.
+     */
+    virtual FGDialog * getDialog (const string &name);
+
+
     virtual FGColor *getColor (const char * name) const {
         _citt_t it = _colors.find(name);
         return (it != _colors.end()) ? it->second : NULL;
@@ -174,18 +185,11 @@ public:
         return (it != _colors.end()) ? it->second : NULL;
     }
 
-    virtual puFont *getDefaultFont() { return &_font; }
-
+    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.
      *
@@ -220,8 +224,7 @@ private:
         }
     };
 
-    fntTexFont _tex_font;
-    puFont _font;
+    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;
@@ -262,10 +265,7 @@ public:
     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;
-    }
+    void print() const;
 
     inline void setRed(float red) { _red = red; }
     inline void setGreen(float green) { _green = green; }
@@ -287,15 +287,51 @@ private:
 
 
 /**
- * A small class to keep all fonts available for future use.
+ * A class to keep all fonts available for future use.
  * This also assures a font isn't resident more than once.
  */
 class FGFontCache {
 private:
+    // The parameters of a request to the cache.
+    struct FntParams
+    {
+        const std::string name;
+        const float size;
+        const float slant;
+        FntParams() : size(0.0f), slant(0.0f) {}
+        FntParams(const FntParams& rhs)
+            : name(rhs.name), size(rhs.size), slant(rhs.slant)
+        {
+        }
+        FntParams(const std::string& name_, float size_, float slant_)
+            : name(name_), size(size_), slant(slant_)
+        {
+        }
+    };
+    struct FntParamsLess
+        : public std::binary_function<const FntParams, const FntParams, bool>
+    {
+        bool operator() (const FntParams& f1, const FntParams& f2) const;
+    };
+    struct fnt {
+        fnt(puFont *pu = 0) : pufont(pu), texfont(0) {}
+        ~fnt() { if (texfont) { delete pufont; delete texfont; } }
+        // Font used by plib GUI code
+        puFont *pufont;
+        // TXF font
+        fntTexFont *texfont;
+    };
+    // Path to the font directory
     SGPath _path;
 
-    map<const char*,puFont*> _fonts;
-    typedef map<const char*,puFont*>::iterator _itt_t;
+    typedef map<const string, fntTexFont*> TexFontMap;
+    typedef map<const FntParams, fnt*, FntParamsLess> PuFontMap;
+    TexFontMap _texFonts;
+    PuFontMap _puFonts;
+
+    bool _initialized;
+    struct fnt *getfnt(const char *name, float size, float slant);
+    void init();
 
 public:
     FGFontCache();
@@ -303,6 +339,18 @@ public:
 
     puFont *get(const char *name, float size=15.0, float slant=0.0);
     puFont *get(SGPropertyNode *node);
+
+    fntTexFont *getTexFont(const char *name, float size=15.0, float slant=0.0);
+
+    SGPath getfntpath(const char *name);
+    /**
+     * Preload all the fonts in the FlightGear font directory. It is
+     * important to load the font textures early, with the proper
+     * graphics context current, so that no plib (or our own) code
+     * tries to load a font from disk when there's no current graphics
+     * context.
+     */
+    bool initializeFonts();
 };