replace depreciated plib symbols with their new forms

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

diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 5b8295ec61f500211130ff3f90365248cb53259c..f45b17ba761e5c3ec3a2618336ba6b4b26ed119c 100644 (file)
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -13,8 +13,6 @@
 #include "menubar.hxx"
 #include "dialog.hxx"
 
-SG_USING_STD(map);
-
 extern puFont FONT_HELVETICA_14;
 extern puFont FONT_SANS_12B;
 
@@ -144,6 +142,16 @@ NewGUI::closeDialog (const string& name)
     return false; // dialog wasn't open...
 }
 
+SGPropertyNode_ptr
+NewGUI::getDialog (const string &name)
+{
+    if(_dialog_props.find(name) != _dialog_props.end())
+        return _dialog_props[name];
+
+    SG_LOG(SG_GENERAL, SG_ALERT, "dialog '" << name << "' missing");
+    return 0;
+}
+
 void
 NewGUI::setActiveDialog (FGDialog * dialog)
 {
@@ -183,6 +191,10 @@ NewGUI::clear ()
     delete _menubar;
     _menubar = 0;
     _dialog_props.clear();
+    _itt_t it;
+    for (it = _colors.begin(); it != _colors.end(); ++it)
+      delete it->second;
+    _colors.clear();
 }
 
 static bool
@@ -266,15 +278,18 @@ NewGUI::readDir (const char * path)
 void
 NewGUI::setStyle (void)
 {
+    _itt_t it;
+    for (it = _colors.begin(); it != _colors.end(); ++it)
+      delete it->second;
     _colors.clear();
 
     // set up the traditional colors as default
-    _colors["background"] = FGColor(0.8f, 0.8f, 0.9f, 0.85f);
-    _colors["foreground"] = FGColor(0.0f, 0.0f, 0.0f, 1.0f);
-    _colors["highlight"]  = FGColor(0.7f, 0.7f, 0.7f, 1.0f);
-    _colors["label"]      = FGColor(0.0f, 0.0f, 0.0f, 1.0f);
-    _colors["legend"]     = FGColor(0.0f, 0.0f, 0.0f, 1.0f);
-    _colors["misc"]       = FGColor(0.0f, 0.0f, 0.0f, 1.0f);
+    _colors["background"] = new FGColor(0.8f, 0.8f, 0.9f, 0.85f);
+    _colors["foreground"] = new FGColor(0.0f, 0.0f, 0.0f, 1.0f);
+    _colors["highlight"]  = new FGColor(0.7f, 0.7f, 0.7f, 1.0f);
+    _colors["label"]      = new FGColor(0.0f, 0.0f, 0.0f, 1.0f);
+    _colors["legend"]     = new FGColor(0.0f, 0.0f, 0.0f, 1.0f);
+    _colors["misc"]       = new FGColor(0.0f, 0.0f, 0.0f, 1.0f);
 
     //puSetDefaultStyle();
 
@@ -289,11 +304,11 @@ NewGUI::setStyle (void)
 
     for (int i = 0; i < n->nChildren(); i++) {
         SGPropertyNode *child = n->getChild(i);
-        _colors[child->getName()] = FGColor(child);
+        _colors[child->getName()] = new FGColor(child);
     }
 
-    FGColor c = _colors["background"];
-    puSetDefaultColourScheme(c.red(), c.green(), c.blue(), c.alpha());
+    FGColor *c = _colors["background"];
+    puSetDefaultColourScheme(c->red(), c->green(), c->blue(), c->alpha());
 }
 
 
@@ -303,17 +318,17 @@ static const struct {
     char *name;
     puFont *font;
 } guifonts[] = {
-    "default",      &FONT_HELVETICA_14,
-    "FIXED_8x13",   &PUFONT_8_BY_13,
-    "FIXED_9x15",   &PUFONT_9_BY_15,
-    "TIMES_10",     &PUFONT_TIMES_ROMAN_10,
-    "TIMES_24",     &PUFONT_TIMES_ROMAN_24,
-    "HELVETICA_10", &PUFONT_HELVETICA_10,
-    "HELVETICA_12", &PUFONT_HELVETICA_12,
-    "HELVETICA_14", &FONT_HELVETICA_14,
-    "HELVETICA_18", &PUFONT_HELVETICA_18,
-    "SANS_12B",     &FONT_SANS_12B,
-    0, 0,
+    { "default",      &FONT_HELVETICA_14 },
+    { "FIXED_8x13",   &PUFONT_8_BY_13 },
+    { "FIXED_9x15",   &PUFONT_9_BY_15 },
+    { "TIMES_10",     &PUFONT_TIMES_ROMAN_10 },
+    { "TIMES_24",     &PUFONT_TIMES_ROMAN_24 },
+    { "HELVETICA_10", &PUFONT_HELVETICA_10 },
+    { "HELVETICA_12", &PUFONT_HELVETICA_12 },
+    { "HELVETICA_14", &FONT_HELVETICA_14 },
+    { "HELVETICA_18", &PUFONT_HELVETICA_18 },
+    { "SANS_12B",     &FONT_SANS_12B },
+    { 0, 0 }
 };
 
 void
@@ -380,18 +395,81 @@ FGColor::merge(const SGPropertyNode *node)
 }
 
 bool
-FGColor::merge(const FGColor& color)
+FGColor::merge(const FGColor *color)
 {
     bool dirty = false;
-    if (color._red >= 0.0)
-        _red = color._red, dirty = true;
-    if (color._green >= 0.0)
-        _green = color._green, dirty = true;
-    if (color._blue >= 0.0)
-        _blue = color._blue, dirty = true;
-    if (color._alpha >= 0.0)
-        _alpha = color._alpha, dirty = true;
+    if (color && color->_red >= 0.0)
+        _red = color->_red, dirty = true;
+    if (color && color->_green >= 0.0)
+        _green = color->_green, dirty = true;
+    if (color && color->_blue >= 0.0)
+        _blue = color->_blue, dirty = true;
+    if (color && color->_alpha >= 0.0)
+        _alpha = color->_alpha, dirty = true;
     return dirty;
 }
 
+
+//
+FGFontCache::FGFontCache()
+{
+    char *envp = ::getenv("FG_FONTS");
+    if (envp != NULL) {
+        _path.set(envp);
+    } else {
+        _path.set(globals->get_fg_root());
+        _path.append("Fonts");
+    }
+
+    for (int i=0; guifonts[i].name; i++)
+        _fonts[guifonts[i].name] = guifonts[i].font;
+}
+
+FGFontCache::~FGFontCache()
+{
+   _fonts.clear();
+}
+
+puFont *
+FGFontCache::get(const char *name, float size, float slant)
+{
+    puFont *font;
+    _itt_t it;
+
+    if ((it = _fonts.find(name)) == _fonts.end())
+    {
+        SGPath path(_path);
+        path.append(name);
+
+        fntTexFont tex_font;
+        if (tex_font.load((char *)path.c_str()))
+        {
+            font = new puFont;
+            font->initialize((fntFont *)&tex_font, size, slant);
+            _fonts[name] = font;
+        }
+        else
+        {
+            font = _fonts["default"];
+            // puSetDefaultFonts(font, font);
+        }
+    }
+    else
+    {
+        font = it->second;
+    }
+
+    return font;
+}
+
+puFont *
+FGFontCache::get(SGPropertyNode *node)
+{
+    const char *name = node->getStringValue("name", "Helvetica.txf");
+    float size = node->getFloatValue("size", 15.0);
+    float slant = node->getFloatValue("slant", 0.0);
+
+    return get(name, size, slant);
+}
+
 // end of new_gui.cxx