From e0945069d8bfd75674f731cd5f8091ff54f1596a Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Tue, 3 Nov 2009 21:40:36 +0000
Subject: [PATCH] Specify GUI fonts in the XML file

---
 include/IXMLParser.hpp           | 19 +++++++++++---
 include/gui2/ContainerWidget.hpp |  2 +-
 include/gui2/Label.hpp           |  2 +-
 include/gui2/RenderContext.hpp   |  6 ++---
 include/gui2/Theme.hpp           | 10 ++++++--
 include/gui2/Widget.hpp          |  2 +-
 layouts/game.xml                 |  5 ++++
 schemas/layout.xsd               | 17 +++++++++++--
 src/gui2/Button.cpp              |  2 +-
 src/gui2/ContainerWidget.cpp     |  2 +-
 src/gui2/Label.cpp               |  2 +-
 src/gui2/Layout.cpp              | 43 +++++++++++++++++++++-----------
 src/gui2/RenderContext.cpp       |  4 +--
 src/gui2/Theme.cpp               | 22 +++++++++-------
 14 files changed, 95 insertions(+), 43 deletions(-)

diff --git a/include/IXMLParser.hpp b/include/IXMLParser.hpp
index 54c74ea..d463b25 100644
--- a/include/IXMLParser.hpp
+++ b/include/IXMLParser.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 #include <stdexcept>
+#include <sstream>
 
 #include <xercesc/sax2/Attributes.hpp>
 #include <xercesc/util/XMLString.hpp>
-#include <boost/lexical_cast.hpp>
 
 // Container for attributes
 class AttributeSet {
@@ -52,15 +52,26 @@ public:
       xercesc::XMLString::release(&xmlName);
       
       if (index != -1) {
-         char* ascii = xercesc::XMLString::transcode(myAttrs.getValue(index));
-         T result = boost::lexical_cast<T>(ascii);
+         char* ascii = xercesc::XMLString::transcode(
+            myAttrs.getValue(index));
+
+         istringstream ss(ascii);
+         T result;
+
+         ss >> boolalpha >> result;  // Is boolalpha affected by locale?
+         
+         if (ss.fail())
+            throw runtime_error(
+               "Cannot parse attribute '" + aName
+               + "' with value '" + ascii + "'");
+         
          xercesc::XMLString::release(&ascii);
          return result;
       }
       else
          throw std::runtime_error("No attribute: " + aName);
    }
-   
+
    template <class T>
    void get(const std::string& aName, T& aT) const
    {
diff --git a/include/gui2/ContainerWidget.hpp b/include/gui2/ContainerWidget.hpp
index c0b793c..9f6696e 100644
--- a/include/gui2/ContainerWidget.hpp
+++ b/include/gui2/ContainerWidget.hpp
@@ -31,7 +31,7 @@ namespace gui {
       ContainerWidget(const AttributeSet& attrs);
 
       virtual void render(RenderContext& rc) const;
-      virtual void adjustForTheme(Theme& theme);
+      virtual void adjustForTheme(const Theme& theme);
 
       void addChild(Widget* w);
       
diff --git a/include/gui2/Label.hpp b/include/gui2/Label.hpp
index 0a8f552..2bf56dd 100644
--- a/include/gui2/Label.hpp
+++ b/include/gui2/Label.hpp
@@ -35,7 +35,7 @@ namespace gui {
       void format(const char* fmt, ...);
 
       void render(RenderContext& rc) const;
-      void adjustForTheme(Theme& theme);
+      void adjustForTheme(const Theme& theme);
    private:
       string text_, fontName;
    };
diff --git a/include/gui2/RenderContext.hpp b/include/gui2/RenderContext.hpp
index cd80dee..d70cf50 100644
--- a/include/gui2/RenderContext.hpp
+++ b/include/gui2/RenderContext.hpp
@@ -33,7 +33,7 @@ namespace gui {
 
    class RenderContext {
    public:
-      RenderContext();
+      RenderContext(const Theme& theme);
       ~RenderContext();
 
       void push_origin(const Widget* w);
@@ -49,8 +49,8 @@ namespace gui {
       const Theme& theme() const { return theme_; }
    private:
       void offset(int& x, int& y) const;
-      
-      Theme theme_;
+
+      const Theme& theme_;
       int origin_x, origin_y;
 
       stack<const Widget*> origin_stack;
diff --git a/include/gui2/Theme.hpp b/include/gui2/Theme.hpp
index 3bee32a..34eb6a0 100644
--- a/include/gui2/Theme.hpp
+++ b/include/gui2/Theme.hpp
@@ -24,6 +24,8 @@
 #include "Colour.hpp"
 #include "ft/IFont.hpp"
 
+#include <map>
+
 namespace gui {
 
    using namespace ft;
@@ -37,12 +39,16 @@ namespace gui {
       Colour border() const;
 
       // Fonts
-      IFontPtr normal_font() const { return normal_font_; }
+      IFontPtr normalFont() const { return normal_font_; }
       IFontPtr font(const string& fontName) const;
+
+      void addFont(const string& name, IFontPtr f);
       
    private:
       IFontPtr normal_font_;
-      IFontPtr dropShadowFont;
+
+      typedef map<string, IFontPtr> FontMap;
+      FontMap fonts;
    };
    
 }
diff --git a/include/gui2/Widget.hpp b/include/gui2/Widget.hpp
index 9b5507c..7ba3ec5 100644
--- a/include/gui2/Widget.hpp
+++ b/include/gui2/Widget.hpp
@@ -51,7 +51,7 @@ namespace gui {
       void connect(Signal sig, SignalHandler handler);
 
       virtual void render(RenderContext& rc) const = 0;
-      virtual void adjustForTheme(Theme& theme) {}
+      virtual void adjustForTheme(const Theme& theme) {}
       
       virtual void handleClick(int x, int y);
       
diff --git a/layouts/game.xml b/layouts/game.xml
index c71d8c2..8f60eac 100644
--- a/layouts/game.xml
+++ b/layouts/game.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layout>
+  <font name="status-font"
+        file="data/fonts/Vera.ttf"
+        dropShadow="true"
+        size="20" />
+
   <!-- Status area -->
   <label text="Speed"
          name="speed_label"
diff --git a/schemas/layout.xsd b/schemas/layout.xsd
index 43787cb..261bc98 100644
--- a/schemas/layout.xsd
+++ b/schemas/layout.xsd
@@ -2,8 +2,21 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:element name="layout">
     <xs:complexType>
-      <xs:group ref="widgetGroup"
-                minOccurs="0" maxOccurs="unbounded"/>
+      <xs:sequence>
+
+        <!-- Font declarations -->
+        <xs:element name="font" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:attribute name="name" type="xs:string"/>
+            <xs:attribute name="file" type="xs:string"/>
+            <xs:attribute name="dropShadow" type="xs:boolean"/>
+            <xs:attribute name="size" type="xs:positiveInteger"/>
+          </xs:complexType>
+        </xs:element>
+
+        <xs:group ref="widgetGroup"
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
     </xs:complexType>
   </xs:element>
   
diff --git a/src/gui2/Button.cpp b/src/gui2/Button.cpp
index 3ce2946..6a3e924 100644
--- a/src/gui2/Button.cpp
+++ b/src/gui2/Button.cpp
@@ -31,7 +31,7 @@ void Button::render(RenderContext& rc) const
    rc.rectangle(x(), y(), width(), height(),
       rc.theme().background());
 
-   IFontPtr f = rc.theme().normal_font();
+   IFontPtr f = rc.theme().normalFont();
 
    int center = (height() - f->height()) / 2;
    
diff --git a/src/gui2/ContainerWidget.cpp b/src/gui2/ContainerWidget.cpp
index ca9fa18..b098b8a 100644
--- a/src/gui2/ContainerWidget.cpp
+++ b/src/gui2/ContainerWidget.cpp
@@ -41,7 +41,7 @@ void ContainerWidget::addChild(Widget* w)
    childAdded(w);
 }
 
-void ContainerWidget::adjustForTheme(Theme& theme)
+void ContainerWidget::adjustForTheme(const Theme& theme)
 {
    for (ChildList::const_iterator it = constBegin();
         it != constEnd(); ++it)
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index f57ce0c..f39971f 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -36,7 +36,7 @@ void Label::render(RenderContext& rc) const
    rc.print(rc.theme().font(fontName), x(), y(), text_);
 }
 
-void Label::adjustForTheme(Theme& theme)
+void Label::adjustForTheme(const Theme& theme)
 {
    IFontPtr font = theme.font(fontName);
    
diff --git a/src/gui2/Layout.cpp b/src/gui2/Layout.cpp
index 7825282..6f259e5 100644
--- a/src/gui2/Layout.cpp
+++ b/src/gui2/Layout.cpp
@@ -43,8 +43,8 @@ public:
    void click(int x, int y);
 
    // IXMLCallback interface
-   void startElement(const string& local_name, const AttributeSet &attrs);
-   void endElement(const string& local_name);
+   void startElement(const string& localName, const AttributeSet &attrs);
+   void endElement(const string& localName);
 private:
 
    // Manages paths during parsing
@@ -71,6 +71,8 @@ private:
    
    typedef map<string, Widget*> WidgetMap;
    WidgetMap widgets;
+
+   Theme theme;
 };
 
 Layout::Layout(const string& file_name)
@@ -88,24 +90,35 @@ Layout::~Layout()
       delete (*it).second;
 }
 
-void Layout::startElement(const string& local_name,
+void Layout::startElement(const string& localName,
    const AttributeSet &attrs)
 {
    Widget* w = NULL;
 
-   if (local_name == "layout") {
+   if (localName == "layout") {
       root = new RootWidget(attrs);
       parse_path.push(root);
       return;
    }
-   else if (local_name == "window")
+   else if (localName == "font") {
+      const string name = attrs.get<string>("name");
+      const string file = attrs.get<string>("file");     
+      const bool dropShadow = attrs.get<bool>("dropShadow", false);
+      const int size = attrs.get<int>("size", 14);
+
+      theme.addFont(name,
+         ft::loadFont(file, size, FONT_NORMAL, dropShadow));
+
+      return;
+   }
+   else if (localName == "window")
       w = new Window(attrs);
-   else if (local_name == "button")
+   else if (localName == "button")
       w = new Button(attrs);
-   else if (local_name == "label")
+   else if (localName == "label")
       w = new Label(attrs);
    else
-      throw runtime_error("Unexpected " + local_name);
+      throw runtime_error("Unexpected " + localName);
 
    Widget* parent = parse_path.top();
    if (ContainerWidget* c = dynamic_cast<ContainerWidget*>(parent)) {
@@ -121,21 +134,21 @@ void Layout::startElement(const string& local_name,
    widgets[parse_path.str()] = w;
    
    debug() << "Add widget " << parse_path.str()
-           << " (" << local_name << ")";
+           << " (" << localName << ")";
 }
 
-void Layout::endElement(const string& local_name)
-{   
-   parse_path.pop();
+void Layout::endElement(const string& localName)
+{
+   if (localName != "font")
+      parse_path.pop();
 }
 
 void Layout::render() const
 {
    assert(root);
-   Theme dummy;
-   root->adjustForTheme(dummy);
+   root->adjustForTheme(theme);
    
-   RenderContext rc;
+   RenderContext rc(theme);
    root->render(rc);
 }
 
diff --git a/src/gui2/RenderContext.cpp b/src/gui2/RenderContext.cpp
index 4e1ebee..aa2313e 100644
--- a/src/gui2/RenderContext.cpp
+++ b/src/gui2/RenderContext.cpp
@@ -27,8 +27,8 @@ using namespace gui;
 
 IWindowPtr getGameWindow();
 
-RenderContext::RenderContext()
-   : origin_x(0), origin_y(0)
+RenderContext::RenderContext(const Theme& theme)
+   : theme_(theme), origin_x(0), origin_y(0)
 {
    glPushAttrib(GL_ENABLE_BIT);
    glEnable(GL_SCISSOR_TEST);
diff --git a/src/gui2/Theme.cpp b/src/gui2/Theme.cpp
index 3cb209d..b6335c7 100644
--- a/src/gui2/Theme.cpp
+++ b/src/gui2/Theme.cpp
@@ -27,11 +27,13 @@ Theme::Theme()
 {
    normal_font_ = ft::loadFont("data/fonts/Vera.ttf",
       18, ft::FONT_NORMAL);
+}
 
-   dropShadowFont = ft::loadFont("data/fonts/Vera.ttf",
-      20, ft::FONT_NORMAL, true);
+void Theme::addFont(const string& name, IFontPtr f)
+{
+   fonts[name] = f;
 }
-      
+
 Colour Theme::background() const
 {
    return makeColour(0.0f, 0.0f, 0.3f, 0.5f);
@@ -44,12 +46,14 @@ Colour Theme::border() const
 
 IFontPtr Theme::font(const string& fontName) const
 {
-   // TODO: Layouts should have a method for specifying fonts!
    if (fontName == "")
-      return normal_font_;
-   else if (fontName == "status-font")
-      return dropShadowFont;
-   else
-      throw runtime_error("Unknown font: " + fontName); 
+      return normalFont();
+   else {
+      FontMap::const_iterator it = fonts.find(fontName);
+      if (it != fonts.end())
+         return (*it).second;
+      else 
+         throw runtime_error("Unknown font: " + fontName);
+   }
 }
 
-- 
2.39.2