From b1e75ebdc87675a1eabf55b5d4932b587246cfe9 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 24 Oct 2009 19:47:48 +0100
Subject: [PATCH] More work on the new GUI

---
 include/gui/IFont.hpp            |  3 +-
 include/gui2/Button.hpp          |  2 +-
 include/gui2/Colour.hpp          | 32 +++++++++++
 include/gui2/ContainerWidget.hpp |  5 ++
 include/gui2/Label.hpp           |  2 +-
 include/gui2/RenderBuffer.hpp    | 43 +++++++++++++++
 include/gui2/RenderContext.hpp   | 57 ++++++++++++++++++++
 include/gui2/Theme.hpp           | 46 ++++++++++++++++
 include/gui2/Widget.hpp          |  9 +++-
 include/gui2/Window.hpp          |  2 +-
 layouts/demo.xml                 |  6 ++-
 schemas/layout.xsd               |  4 ++
 src/gui2/Button.cpp              |  8 ++-
 src/gui2/ContainerWidget.cpp     | 13 +++++
 src/gui2/Label.cpp               |  2 +-
 src/gui2/Layout.cpp              | 52 +++++++++++-------
 src/gui2/RenderContext.cpp       | 91 ++++++++++++++++++++++++++++++++
 src/gui2/Theme.cpp               | 35 ++++++++++++
 src/gui2/Widget.cpp              |  8 ++-
 src/gui2/Window.cpp              | 14 ++++-
 20 files changed, 404 insertions(+), 30 deletions(-)
 create mode 100644 include/gui2/Colour.hpp
 create mode 100644 include/gui2/RenderBuffer.hpp
 create mode 100644 include/gui2/RenderContext.hpp
 create mode 100644 include/gui2/Theme.hpp
 create mode 100644 src/gui2/RenderContext.cpp
 create mode 100644 src/gui2/Theme.cpp

diff --git a/include/gui/IFont.hpp b/include/gui/IFont.hpp
index c8ba454..fbf3dbc 100644
--- a/include/gui/IFont.hpp
+++ b/include/gui/IFont.hpp
@@ -37,7 +37,8 @@ namespace gui {
 
    typedef std::tr1::shared_ptr<IFont> IFontPtr;
 
-   IFontPtr loadFont(const std::string& aFile, int aHeight, bool shadow=true);
+   IFontPtr loadFont(const std::string& aFile, int aHeight,
+      bool shadow=true);
 }
 
 #endif
diff --git a/include/gui2/Button.hpp b/include/gui2/Button.hpp
index 9207372..0d774e7 100644
--- a/include/gui2/Button.hpp
+++ b/include/gui2/Button.hpp
@@ -34,7 +34,7 @@ namespace gui {
       const string& label() const { return label_; }
       void label(const string& t) { label_ = t; }
 
-      void render() const;
+      void render(RenderContext& rc) const;
    private:
       string label_;
    };
diff --git a/include/gui2/Colour.hpp b/include/gui2/Colour.hpp
new file mode 100644
index 0000000..6d427cf
--- /dev/null
+++ b/include/gui2/Colour.hpp
@@ -0,0 +1,32 @@
+//
+//  Copyright (C) 2006-2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_GUI2_COLOUR_HPP
+#define INC_GUI2_COLOUR_HPP
+
+#include "Platform.hpp"
+
+namespace gui {
+   typedef tuple<float, float, float, float> Colour;
+
+   inline Colour make_colour(float r, float g, float b, float a=1.0f)
+   {
+      return make_tuple(r, g, b, a);
+   }
+}
+
+#endif
diff --git a/include/gui2/ContainerWidget.hpp b/include/gui2/ContainerWidget.hpp
index e530535..0db91ce 100644
--- a/include/gui2/ContainerWidget.hpp
+++ b/include/gui2/ContainerWidget.hpp
@@ -29,6 +29,10 @@ namespace gui {
    class ContainerWidget : public Widget {
    public:
       ContainerWidget(const AttributeSet& attrs);
+
+      virtual void render(RenderContext& rc) const;
+
+      void add_child(Widget* w);
       
    protected:
       virtual void child_added(Widget* w) {};
@@ -42,6 +46,7 @@ namespace gui {
       { return children.begin(); }
       ChildList::const_iterator const_end() const
       { return children.end(); }
+      
    private:
       ChildList children;
    };
diff --git a/include/gui2/Label.hpp b/include/gui2/Label.hpp
index c70bce7..5c5f1de 100644
--- a/include/gui2/Label.hpp
+++ b/include/gui2/Label.hpp
@@ -34,7 +34,7 @@ namespace gui {
       const string& text() const { return text_; }
       void text(const string& t) { text_ = t; }
 
-      void render() const;
+      void render(RenderContext& rc) const;
    private:
       string text_;
    };
diff --git a/include/gui2/RenderBuffer.hpp b/include/gui2/RenderBuffer.hpp
new file mode 100644
index 0000000..e05cd51
--- /dev/null
+++ b/include/gui2/RenderBuffer.hpp
@@ -0,0 +1,43 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_GUI_RENDERBUFFER_HPP
+#define INC_GUI_RENDERBUFFER_HPP
+
+// Internal header: do not include this file directly
+
+#include "Platform.hpp"
+
+#include <string>
+
+namespace gui {
+
+   class Window : public ContainerWidget {
+   public:
+      Window(const AttributeSet& attrs);
+
+      const string& title() const { return title_; }
+      void title(const string& t) { title_ = t; }
+
+      void render() const;
+   private:
+      string title_;
+   };
+   
+}
+
+#endif
diff --git a/include/gui2/RenderContext.hpp b/include/gui2/RenderContext.hpp
new file mode 100644
index 0000000..47415c6
--- /dev/null
+++ b/include/gui2/RenderContext.hpp
@@ -0,0 +1,57 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_GUI_RENDERCONTEXT_HPP
+#define INC_GUI_RENDERCONTEXT_HPP
+
+// Internal header: do not include this file directly
+
+#include "Platform.hpp"
+#include "gui2/Colour.hpp"
+#include "gui2/Theme.hpp"
+
+#include <string>
+#include <stack>
+
+namespace gui {
+
+   class RenderContext {
+   public:
+      RenderContext();
+      ~RenderContext();
+
+      void push_origin(int x, int y);
+      void pop_origin();
+
+      void rectangle(int x, int y, int w, int h, Colour c);
+      void border(int x, int y, int w, int h, Colour c);
+
+      void print(IFontPtr font, int x, int y, const string& s);
+
+      const Theme& theme() const { return theme_; }
+   private:
+      void offset(int& x, int& y) const;
+      
+      Theme theme_;
+      int origin_x, origin_y;
+
+      stack<pair<int, int> > origin_stack;
+   };
+   
+}
+
+#endif
diff --git a/include/gui2/Theme.hpp b/include/gui2/Theme.hpp
new file mode 100644
index 0000000..bdfe1b1
--- /dev/null
+++ b/include/gui2/Theme.hpp
@@ -0,0 +1,46 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_GUI_THEME_HPP
+#define INC_GUI_THEME_HPP
+
+// Internal header: do not include this file directly
+
+#include "Platform.hpp"
+#include "gui2/Colour.hpp"
+#include "gui/IFont.hpp"
+
+namespace gui {
+
+   class Theme {
+   public:
+      Theme();
+
+      // Colours
+      Colour background() const;
+      Colour border() const;
+
+      // Fonts
+      IFontPtr normal_font() const { return normal_font_; }
+      
+   private:
+      IFontPtr normal_font_; 
+   };
+   
+}
+
+#endif
diff --git a/include/gui2/Widget.hpp b/include/gui2/Widget.hpp
index f68b1fd..cce1161 100644
--- a/include/gui2/Widget.hpp
+++ b/include/gui2/Widget.hpp
@@ -22,6 +22,7 @@
 
 #include "Platform.hpp"
 #include "gui2/ILayout.hpp"
+#include "gui2/RenderContext.hpp"
 #include "IXMLParser.hpp"
 
 #include <string>
@@ -36,11 +37,15 @@ namespace gui {
       Widget(const AttributeSet& attrs);
 
       const string& name() const { return name_; }
+      int x() const { return x_; }
+      int y() const { return y_; }
+      int width() const { return width_; }
+      int height() const { return height_; }
 
       boost::any get_property(const string& key) const;
       void set_property(const string& key, boost::any value);
 
-      virtual void render() const = 0;
+      virtual void render(RenderContext& rc) const = 0;
 
    protected:      
       template <class T>
@@ -62,6 +67,8 @@ namespace gui {
       static string unique_name();
       
       string name_;
+      int x_, y_, width_, height_;
+      
       const AttributeSet& tmp_attrs;   // Do not use after initialisation
       
       typedef map<string, boost::any> PropertyMap;
diff --git a/include/gui2/Window.hpp b/include/gui2/Window.hpp
index f983ed9..a9f5d50 100644
--- a/include/gui2/Window.hpp
+++ b/include/gui2/Window.hpp
@@ -35,7 +35,7 @@ namespace gui {
       const string& title() const { return title_; }
       void title(const string& t) { title_ = t; }
 
-      void render() const;
+      void render(RenderContext& rc) const;
    private:
       string title_;
    };
diff --git a/layouts/demo.xml b/layouts/demo.xml
index b7e2451..5d45643 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layout>
-  <window>
-    <button name="btn1" label="One"/>
+  <window x="10" y="10" width="100" height="200"
+          name="wnd1">
+    <button name="btn1" label="One"
+            x="5" y="5" width="80" height="25" />
     <button name="btn2" label="Two"/>
     <label text="Hello, World!"/>
   </window>
diff --git a/schemas/layout.xsd b/schemas/layout.xsd
index a03935b..0f3f70b 100644
--- a/schemas/layout.xsd
+++ b/schemas/layout.xsd
@@ -19,6 +19,10 @@
   <!-- Attributes for all widgets -->
   <xs:complexType name="widgetType">
     <xs:attribute name="name" type="xs:string"/>
+    <xs:attribute name="x" type="xs:integer"/>
+    <xs:attribute name="y" type="xs:integer"/>
+    <xs:attribute name="width" type="xs:integer"/>
+    <xs:attribute name="height" type="xs:integer"/>
   </xs:complexType>
 
   <!-- Top-level windows -->
diff --git a/src/gui2/Button.cpp b/src/gui2/Button.cpp
index c3fc624..4a195db 100644
--- a/src/gui2/Button.cpp
+++ b/src/gui2/Button.cpp
@@ -25,7 +25,13 @@ Button::Button(const AttributeSet& attrs)
    property("label", label_);
 }
 
-void Button::render() const
+void Button::render(RenderContext& rc) const
 {
+   rc.rectangle(x(), y(), width(), height(),
+      rc.theme().background());
+   rc.border(x(), y(), width(), height(),
+      rc.theme().border());
 
+   rc.print(rc.theme().normal_font(), x() + 5, y() + 5,
+      "Yahyahyah");
 }
diff --git a/src/gui2/ContainerWidget.cpp b/src/gui2/ContainerWidget.cpp
index cb22242..a32e34a 100644
--- a/src/gui2/ContainerWidget.cpp
+++ b/src/gui2/ContainerWidget.cpp
@@ -24,3 +24,16 @@ ContainerWidget::ContainerWidget(const AttributeSet& attrs)
 {
 
 }
+
+void ContainerWidget::render(RenderContext& rc) const
+{
+   for (ChildList::const_iterator it = const_begin();
+        it != const_end(); ++it)
+      (*it)->render(rc);
+}
+
+void ContainerWidget::add_child(Widget* w)
+{
+   children.push_back(w);
+   child_added(w);
+}
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index f93dd17..002a753 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -25,7 +25,7 @@ Label::Label(const AttributeSet& attrs)
    property("text", text_);
 }
 
-void Label::render() const
+void Label::render(RenderContext& rc) const
 {
 
 }
diff --git a/src/gui2/Layout.cpp b/src/gui2/Layout.cpp
index 421d892..01259fe 100644
--- a/src/gui2/Layout.cpp
+++ b/src/gui2/Layout.cpp
@@ -17,6 +17,7 @@
 
 #include "gui2/ILayout.hpp"
 #include "IXMLParser.hpp"
+#include "ILogger.hpp"
 
 #include "gui2/Widget.hpp"
 #include "gui2/ContainerWidget.hpp"
@@ -45,21 +46,20 @@ private:
    // Manages paths during parsing
    class PathStack {
    public:
-      void push(const string& s) { path_comps.push_back(s); }
+      void push(Widget* w) { path_comps.push_back(w); }
       void pop() { path_comps.pop_back(); }
 
       string str() const;
+      Widget* top() const;
       
    private:
-      vector<string> path_comps;
+      vector<Widget*> path_comps;
    };
 
    // Root of widget hierarchy
    class RootWidget : public ContainerWidget {
    public:
       RootWidget(const AttributeSet& attrs) : ContainerWidget(attrs) {}
-      
-      void render() const;
    };
 
    PathStack parse_path;
@@ -70,6 +70,8 @@ Layout::Layout(const string& file_name)
 {   
    IXMLParserPtr parser = makeXMLParser("schemas/layout.xsd");
    parser->parse(file_name, *this);
+
+   log() << "Loaded UI layout from " << file_name;
 }
 
 void Layout::startElement(const string& local_name,
@@ -79,7 +81,7 @@ void Layout::startElement(const string& local_name,
 
    if (local_name == "layout") {
       root = new RootWidget(attrs);
-      parse_path.push("<<layout>>");
+      parse_path.push(root);
       return;
    }
    else if (local_name == "window")
@@ -91,7 +93,19 @@ void Layout::startElement(const string& local_name,
    else
       throw runtime_error("Unexpected " + local_name);
 
-   parse_path.push(w->name());
+   Widget* parent = parse_path.top();
+   if (ContainerWidget* c = dynamic_cast<ContainerWidget*>(parent)) {
+      c->add_child(w);
+   }
+   else {
+      throw runtime_error("Widget " + parse_path.str()
+         + " cannot contain children");
+   }      
+
+   parse_path.push(w);
+
+   debug() << "Add widget " << parse_path.str()
+           << " (" << local_name << ")";
 }
 
 void Layout::endElement(const string& local_name)
@@ -101,14 +115,8 @@ void Layout::endElement(const string& local_name)
 
 void Layout::render() const
 {
-
-}
-
-void Layout::RootWidget::render() const
-{
-   for (ChildList::const_iterator it = const_begin();
-        it != const_end(); ++it)
-      (*it)->render();
+   RenderContext rc;
+   root->render(rc);
 }
 
 IWidgetPtr Layout::get(const string& path) const
@@ -120,17 +128,25 @@ string Layout::PathStack::str() const
 {
    ostringstream ss;
 
-   if (path_comps.empty())
+   if (path_comps.empty() || path_comps.size() == 1)
       return "/";
    else {
-      for (vector<string>::const_iterator it = path_comps.begin();
-           it != path_comps.end(); ++it)
-         ss << "/" << *it;
+      // Skip over root element
+      vector<Widget*>::const_iterator it = path_comps.begin() + 1;
+      for (; it != path_comps.end(); ++it)
+         ss << "/" << (*it)->name();
       
       return ss.str();
    }
 }
 
+Widget* Layout::PathStack::top() const
+{
+   assert(!path_comps.empty());
+
+   return path_comps.back();
+}
+
 ILayoutPtr gui::make_layout(const string& file_name)
 {
    return ILayoutPtr(new Layout(file_name));
diff --git a/src/gui2/RenderContext.cpp b/src/gui2/RenderContext.cpp
new file mode 100644
index 0000000..29a8a8e
--- /dev/null
+++ b/src/gui2/RenderContext.cpp
@@ -0,0 +1,91 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include "gui2/RenderContext.hpp"
+
+#include <GL/gl.h>
+
+using namespace gui;
+
+namespace {
+   inline void set_colour(Colour c)
+   {
+      glColor4f(get<0>(c), get<1>(c), get<2>(c), get<3>(c));
+   }
+}
+
+RenderContext::RenderContext()
+   : origin_x(0), origin_y(0)
+{
+
+}
+
+RenderContext::~RenderContext()
+{
+
+}
+
+void RenderContext::push_origin(int x, int y)
+{
+   origin_x = x;
+   origin_y = y;
+   origin_stack.push(make_pair(x, y));
+}
+
+void RenderContext::pop_origin()
+{
+   tie(origin_x, origin_y) = origin_stack.top();
+   origin_stack.pop();
+}
+
+void RenderContext::offset(int& x, int& y) const
+{
+   x += origin_x;
+   y += origin_y;
+}
+
+void RenderContext::rectangle(int x, int y, int w, int h, Colour c)
+{
+   offset(x, y);
+   set_colour(c);
+   
+   glBegin(GL_QUADS);
+   glVertex2i(x, y);
+   glVertex2i(x + w, y);
+   glVertex2i(x + w, y + h);
+   glVertex2i(x, y + h);
+   glEnd();
+}
+
+void RenderContext::border(int x, int y, int w, int h, Colour c)
+{
+   offset(x, y);
+   set_colour(c);
+   
+   glBegin(GL_LINE_LOOP);
+   glVertex2i(x, y);
+   glVertex2i(x + w, y);
+   glVertex2i(x + w, y + h);
+   glVertex2i(x, y + h);
+   glEnd();
+}
+
+void RenderContext::print(IFontPtr font, int x, int y, const string& s)
+{
+   offset(x, y);
+   font->print(x, y, "%s", s.c_str());
+}
diff --git a/src/gui2/Theme.cpp b/src/gui2/Theme.cpp
new file mode 100644
index 0000000..1cee39a
--- /dev/null
+++ b/src/gui2/Theme.cpp
@@ -0,0 +1,35 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include "gui2/Theme.hpp"
+
+using namespace gui;
+
+Theme::Theme()
+{
+   normal_font_ = loadFont("data/fonts/Vera.ttf", 14);
+}
+      
+Colour Theme::background() const
+{
+   return make_colour(0.3f, 0.0f, 0.0f, 0.5f);
+}
+
+Colour Theme::border() const
+{
+   return make_colour(1.0f, 0.0f, 0.0f, 0.5f);
+}
diff --git a/src/gui2/Widget.cpp b/src/gui2/Widget.cpp
index 1d475c0..127d065 100644
--- a/src/gui2/Widget.cpp
+++ b/src/gui2/Widget.cpp
@@ -20,6 +20,8 @@
 
 #include "gui2/Widget.hpp"
 
+#include <boost/lexical_cast.hpp>
+
 using namespace gui;
 
 int Widget::unique_id(0);
@@ -28,11 +30,15 @@ Widget::Widget(const AttributeSet& attrs)
    : tmp_attrs(attrs)
 {
    const_property("name", name_, unique_name());
+   property("x", x_);
+   property("y", y_);
+   property("width", width_);
+   property("height", height_);
 }
 
 string Widget::unique_name()
 {
-   return "widget" + unique_id++;
+   return "widget" + boost::lexical_cast<string>(unique_id++);
 }
 
 boost::any Widget::get_property(const string& key) const
diff --git a/src/gui2/Window.cpp b/src/gui2/Window.cpp
index d2f496e..2163f32 100644
--- a/src/gui2/Window.cpp
+++ b/src/gui2/Window.cpp
@@ -16,6 +16,7 @@
 //
 
 #include "gui2/Window.hpp"
+#include "ILogger.hpp"
 
 using namespace gui;
 
@@ -25,8 +26,17 @@ Window::Window(const AttributeSet& attrs)
    property("title", title_);
 }
 
-void Window::render() const
-{
+void Window::render(RenderContext& rc) const
+{   
+   rc.rectangle(x(), y(), width(), height(),
+      rc.theme().background());
+   rc.border(x(), y(), width(), height(),
+      rc.theme().border());
+
+   rc.push_origin(x(), y());
 
+   ContainerWidget::render(rc);
+   
+   rc.pop_origin();
 }
 
-- 
2.39.2