X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fnew_gui.hxx;h=a0e4e69af6b963fddd6b03ff6f8074085bf6f8c8;hb=846fd2169832c8938f04386139de746a06e80d4b;hp=a3668f769b4804cbcd885d5ead36dc1381f10f8c;hpb=f3e88fc05d39c1c67eee79aa6d5c2a75039b4528;p=flightgear.git

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index a3668f769..a0e4e69af 100644
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -3,33 +3,20 @@
 #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>
-SG_USING_STD(vector);
-
 #include <map>
-SG_USING_STD(map);
-
-#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.
@@ -59,8 +46,10 @@ public:
      */
     virtual void init ();
 
+    virtual void shutdown ();
+    
     /**
-     * Reinitialize the GUI subsystem.
+     * Reinitialize the GUI subsystem. Reloads all XML dialogs.
      */
     virtual void reinit ();
 
@@ -85,6 +74,11 @@ public:
      */
     virtual void update (double delta_time_sec);
 
+    /**
+     * Redraw the GUI picking up new GUI colors.
+     */
+    virtual void redraw ();
+
     /**
      * Creates a new dialog box, using the same property format as the
      * gui/dialogs configuration files.  Does not display the
@@ -109,7 +103,7 @@ public:
      * @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);
 
 
     /**
@@ -128,14 +122,20 @@ public:
      * @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 std::string &name);
 
     /**
      * Return a pointer to the current menubar.
      */
     virtual FGMenuBar * getMenuBar ();
 
-
     /**
      * Ignore this method.
      *
@@ -151,10 +151,26 @@ 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 puFont *getDefaultFont() { return &_font; }
+    /**
+     * Get the named dialog if active.
+     *
+     * @return The named dialog, or 0 if it isn't active.
+     */
+    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 std::string &name) const {
+        _citt_t it = _colors.find(name.c_str());
+        return (it != _colors.end()) ? it->second : NULL;
+    }
+
+    virtual puFont *getDefaultFont() { return _font; }
+
 
 protected:
 
@@ -173,75 +189,52 @@ protected:
     virtual void setMenuBarVisible (bool visible);
 
     virtual void setStyle ();
-    virtual void setupFont ();
+    virtual void setupFont (SGPropertyNode *);
 
-private:
-    fntTexFont _tex_font;
-    puFont _font;
-    map<string,FGColor> _colors;
+    /**
+     * Used by reinit() and redraw() to close all dialogs and to apply
+     * current GUI colors. If "reload" is false, reopens all dialogs.
+     * Otherwise reloads all XML dialog files from disk and reopens all
+     * but Nasal * generated dialogs, omitting dynamic widgets. (This
+     * is only useful for GUI development.)
+     */
+    virtual void reset (bool reload);
 
-    // Free all allocated memory.
-    void clear ();
+private:
+    void createMenuBarImplementation();
+    
+    struct ltstr
+    {
+        bool operator()(const char* s1, const char* s2) const {
+            return strcmp(s1, s2) < 0;
+        }
+    };
+
+    puFont *_font;
+    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& operator=(const FGColor& c) {
-        _red = c._red;
-        _green = c._green;
-        _blue = c._blue;
-        _alpha = c._alpha;
-        return *this;
-    }
+    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;
 
-    inline void clear() { _red = _green = _blue = _alpha = -1.0f; }
-    // merges in non-negative components from property with children <red> etc.
-    void merge(const SGPropertyNode *prop);
-    void merge(const FGColor& color);
-
-    void set(const SGPropertyNode *prop) { clear(); merge(prop); };
-    void set(const FGColor& color) { clear(); merge(color); }
-    void set(float r, float g, float b, float a = 1.0f) {
-        _red = clamp(r), _green = clamp(g), _blue = clamp(b), _alpha = clamp(a);
-    }
-    bool isValid() const {
-        return _red >= 0.0 && _green >= 0.0 && _blue >= 0.0
-                && _alpha >= 0.0;
-    }
-    void print() const {
-        std::cerr << "red=" << _red << ", green=" << _green
-        << ", blue=" << _blue << ", alpha=" << _alpha << std::endl;
-    }
-
-    inline void setRed(float red) { _red = clamp(red); }
-    inline void setGreen(float green) { _green = clamp(green); }
-    inline void setBlue(float blue) { _blue = clamp(blue); }
-    inline void setAlpha(float alpha) { _alpha = clamp(alpha); }
-
-    inline float red() const { return _red; }
-    inline float green() const { return _green; }
-    inline float blue() const { return _blue; }
-    inline float alpha() const { return _alpha; }
-
-protected:
-    float _red, _green, _blue, _alpha;
-
-private:
-    float clamp(float f) { return f < 0.0 ? 0.0 : f > 1.0 ? 1.0 : f; }
 };