From 6e3c7e13d45672632453420096fa981b203f5aea Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 25 Oct 2009 16:58:31 +0000
Subject: [PATCH] Add event handling to the new GUI

---
 include/gui2/ContainerWidget.hpp |  3 +++
 include/gui2/ILayout.hpp         | 12 ++++-------
 include/gui2/Label.hpp           |  1 +
 include/gui2/Widget.hpp          | 20 +++++++++++++----
 layouts/demo.xml                 | 11 ++++++++--
 src/UIDemo.cpp                   | 29 +++++++++++++++++++++++--
 src/gui2/ContainerWidget.cpp     | 20 +++++++++++++++++
 src/gui2/Label.cpp               |  8 ++++++-
 src/gui2/Layout.cpp              | 37 ++++++++++++++++++++++++++++----
 src/gui2/Widget.cpp              | 21 ++++++++++++++----
 10 files changed, 137 insertions(+), 25 deletions(-)

diff --git a/include/gui2/ContainerWidget.hpp b/include/gui2/ContainerWidget.hpp
index 0db91ce..b633600 100644
--- a/include/gui2/ContainerWidget.hpp
+++ b/include/gui2/ContainerWidget.hpp
@@ -31,9 +31,12 @@ namespace gui {
       ContainerWidget(const AttributeSet& attrs);
 
       virtual void render(RenderContext& rc) const;
+      virtual void adjust_for_theme(Theme& theme);
 
       void add_child(Widget* w);
       
+      virtual void handle_click(int x, int y);
+      
    protected:
       virtual void child_added(Widget* w) {};
 
diff --git a/include/gui2/ILayout.hpp b/include/gui2/ILayout.hpp
index cbd4cdc..86efa57 100644
--- a/include/gui2/ILayout.hpp
+++ b/include/gui2/ILayout.hpp
@@ -19,6 +19,7 @@
 #define INC_GUI_ILAYOUT_HPP
 
 #include "Platform.hpp"
+#include "gui2/Widget.hpp"
 
 #include <string>
 
@@ -26,19 +27,14 @@
 
 namespace gui {
    
-   // A generic UI element
-   struct IWidget {
-      virtual ~IWidget() {}
-   };
-
-   typedef shared_ptr<IWidget> IWidgetPtr;
-   
    // A complete set of UI elements
    struct ILayout {
       virtual ~ILayout() {}
 
-      virtual IWidgetPtr get(const string& path) const = 0;
+      virtual Widget& get(const string& path) const = 0;
       virtual void render() const = 0;
+
+      virtual void click(int x, int y) = 0;
    };
 
    typedef shared_ptr<ILayout> ILayoutPtr;
diff --git a/include/gui2/Label.hpp b/include/gui2/Label.hpp
index 1b77cab..c84567c 100644
--- a/include/gui2/Label.hpp
+++ b/include/gui2/Label.hpp
@@ -33,6 +33,7 @@ namespace gui {
       void text(const string& t) { text_ = t; }
 
       void render(RenderContext& rc) const;
+      void adjust_for_theme(Theme& theme);
    private:
       string text_;
    };
diff --git a/include/gui2/Widget.hpp b/include/gui2/Widget.hpp
index 1f7501d..210cce8 100644
--- a/include/gui2/Widget.hpp
+++ b/include/gui2/Widget.hpp
@@ -21,7 +21,6 @@
 // Internal header: do not include this file directly
 
 #include "Platform.hpp"
-#include "gui2/ILayout.hpp"
 #include "gui2/RenderContext.hpp"
 #include "IXMLParser.hpp"
 
@@ -30,7 +29,7 @@
 
 namespace gui {
 
-   class Widget : public IWidget {
+   class Widget {
    public:
       Widget(const AttributeSet& attrs);
 
@@ -43,16 +42,29 @@ namespace gui {
       void width(int w) { width_ = w; }
       void height(int h) { height_ = h; }
 
-      boost::any get_property(const string& key) const;
-      void set_property(const string& key, boost::any value);
+      enum Signal {
+         SIG_CLICK
+      };
+
+      typedef function<void (Widget&)> SignalHandler;
+
+      void connect(Signal sig, SignalHandler handler);
 
       virtual void render(RenderContext& rc) const = 0;
+      virtual void adjust_for_theme(Theme& theme) {}
+      
+      virtual void handle_click(int x, int y);
+      
+   protected:
+      void raise(Signal sig);
 
    private:
       static string unique_name();
       
       string name_;
       int x_, y_, width_, height_;
+
+      map<Signal, SignalHandler> handlers;
             
       static int unique_id;
    };
diff --git a/layouts/demo.xml b/layouts/demo.xml
index c937243..6bfe784 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -4,8 +4,15 @@
           name="wnd1">
     <button name="btn1" label="One"
             x="5" y="5" width="80" height="25" />
-    <button name="btn2" label="Two"/>
+    <button name="btn2" label="Two"
+            x="5" y="35" width="80" height="25" />
     <label text="abcdefghijklmnopqrstuvwxyz"
-           x="5" y="60" width="150" height="20"/>
+           name="cntlabel"
+           x="5" y="60"/>
+  </window>
+
+  <window x="300" y="100" width="200" height="250"
+          name="bigwnd">
+    
   </window>
 </layout>
diff --git a/src/UIDemo.cpp b/src/UIDemo.cpp
index afd89f8..6f6cebf 100644
--- a/src/UIDemo.cpp
+++ b/src/UIDemo.cpp
@@ -17,7 +17,10 @@
 
 #include "IScreen.hpp"
 #include "gui2/ILayout.hpp"
-#include "ft/IFont.hpp"
+#include "gui2/Label.hpp"
+#include "ILogger.hpp"
+
+#include <boost/lexical_cast.hpp>
 
 class UIDemo : public IScreen {
 public:
@@ -32,17 +35,33 @@ public:
    void onMouseMove(IPickBufferPtr aPickBuffer, int x, int y,
       int xrel, int yrel) {}
    void onMouseClick(IPickBufferPtr pick_buffer, int x, int y,
-      MouseButton button) {}
+      MouseButton button);
    void onMouseRelease(IPickBufferPtr pick_buffer, int x, int y,
       MouseButton button) {}
    
 private:
+   void btn1_click(gui::Widget& w);
+   
    gui::ILayoutPtr layout;
 };
 
 UIDemo::UIDemo()
 {
+   using namespace placeholders;
+   
    layout = gui::make_layout("layouts/demo.xml");
+
+   layout->get("/wnd1/btn1").connect(gui::Widget::SIG_CLICK,
+      bind(&UIDemo::btn1_click, this, _1));
+}
+
+void UIDemo::btn1_click(gui::Widget& w)
+{
+   static int cnt = 0;
+   debug() << "Clicked button 1!";
+
+   dynamic_cast<gui::Label&>(layout->get("/wnd1/cntlabel")).text(
+      boost::lexical_cast<string>(++cnt));
 }
 
 void UIDemo::overlay() const
@@ -50,6 +69,12 @@ void UIDemo::overlay() const
    layout->render();
 }
 
+void UIDemo::onMouseClick(IPickBufferPtr pick_buffer, int x, int y,
+   MouseButton button)
+{
+   layout->click(x, y);
+}
+
 IScreenPtr make_ui_demo()
 {
    return IScreenPtr(new UIDemo);
diff --git a/src/gui2/ContainerWidget.cpp b/src/gui2/ContainerWidget.cpp
index 44a8484..540b750 100644
--- a/src/gui2/ContainerWidget.cpp
+++ b/src/gui2/ContainerWidget.cpp
@@ -16,6 +16,7 @@
 //
 
 #include "gui2/ContainerWidget.hpp"
+#include "ILogger.hpp"
 
 using namespace gui;
 
@@ -39,3 +40,22 @@ void ContainerWidget::add_child(Widget* w)
    children.push_back(w);
    child_added(w);
 }
+
+void ContainerWidget::adjust_for_theme(Theme& theme)
+{
+   for (ChildList::const_iterator it = const_begin();
+        it != const_end(); ++it)
+      (*it)->adjust_for_theme(theme);
+}
+
+void ContainerWidget::handle_click(int x, int y)
+{
+   for (ChildList::const_iterator it = const_begin();
+        it != const_end(); ++it) {
+      Widget& w = **it;
+
+      if (w.x() <= x && x < w.x() + w.width()
+         && w.y() <= y && y < w.y() + w.height())
+         w.handle_click(x - w.x(), y - w.y());
+   }
+}
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index a2e0602..2926476 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -24,10 +24,16 @@ Label::Label(const AttributeSet& attrs)
    : Widget(attrs),
      text_(attrs.get<string>("text"))
 {
-   width(500);
+   
 }
 
 void Label::render(RenderContext& rc) const
 {
    rc.print(rc.theme().normal_font(), x(), y(), text_);
 }
+
+void Label::adjust_for_theme(Theme& theme)
+{
+   width(theme.normal_font()->text_width(text_));
+   height(theme.normal_font()->height());
+}
diff --git a/src/gui2/Layout.cpp b/src/gui2/Layout.cpp
index 01259fe..92bf833 100644
--- a/src/gui2/Layout.cpp
+++ b/src/gui2/Layout.cpp
@@ -27,17 +27,21 @@
 
 #include <vector>
 #include <sstream>
+#include <map>
 
 using namespace gui;
 
 class Layout : public ILayout, private IXMLCallback {
 public:
    Layout(const string& file_name);
+   ~Layout();
 
    // ILayout interface
-   IWidgetPtr get(const string& path) const;
+   Widget& get(const string& path) const;
    void render() const;
 
+   void click(int x, int y);
+
    // IXMLCallback interface
    void startElement(const string& local_name, const AttributeSet &attrs);
    void endElement(const string& local_name);
@@ -64,6 +68,9 @@ private:
 
    PathStack parse_path;
    Widget* root;
+   
+   typedef map<string, Widget*> WidgetMap;
+   WidgetMap widgets;
 };
 
 Layout::Layout(const string& file_name)
@@ -71,9 +78,20 @@ Layout::Layout(const string& file_name)
    IXMLParserPtr parser = makeXMLParser("schemas/layout.xsd");
    parser->parse(file_name, *this);
 
+   assert(root);
+   Theme dummy;
+   root->adjust_for_theme(dummy);
+
    log() << "Loaded UI layout from " << file_name;
 }
 
+Layout::~Layout()
+{
+   for (WidgetMap::iterator it = widgets.begin();
+        it != widgets.end(); ++it)
+      delete (*it).second;
+}
+
 void Layout::startElement(const string& local_name,
    const AttributeSet &attrs)
 {
@@ -104,12 +122,14 @@ void Layout::startElement(const string& local_name,
 
    parse_path.push(w);
 
+   widgets[parse_path.str()] = w;
+   
    debug() << "Add widget " << parse_path.str()
            << " (" << local_name << ")";
 }
 
 void Layout::endElement(const string& local_name)
-{
+{   
    parse_path.pop();
 }
 
@@ -119,9 +139,18 @@ void Layout::render() const
    root->render(rc);
 }
 
-IWidgetPtr Layout::get(const string& path) const
+Widget& Layout::get(const string& path) const
+{
+   WidgetMap::const_iterator it = widgets.find(path);
+   if (it != widgets.end())
+      return *(*it).second;
+   else
+      throw runtime_error("Widget " + path + " does not exist");
+}
+
+void Layout::click(int x, int y)
 {
-   return IWidgetPtr();
+   root->handle_click(x, y);
 }
 
 string Layout::PathStack::str() const
diff --git a/src/gui2/Widget.cpp b/src/gui2/Widget.cpp
index 19110bb..b84f14b 100644
--- a/src/gui2/Widget.cpp
+++ b/src/gui2/Widget.cpp
@@ -15,9 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INC_WIDGET_HPP
-#define INC_WIDGET_HPP
-
 #include "gui2/Widget.hpp"
 #include "ILogger.hpp"
 
@@ -42,4 +39,20 @@ string Widget::unique_name()
    return "widget" + boost::lexical_cast<string>(unique_id++);
 }
 
-#endif
+void Widget::raise(Signal sig)
+{
+   map<Signal, SignalHandler>::iterator it = handlers.find(sig);
+   if (it != handlers.end())
+      (*it).second(*this);
+}
+
+void Widget::connect(Signal sig, SignalHandler handler)
+{
+   handlers[sig] = handler;
+}
+
+void Widget::handle_click(int x, int y)
+{
+   raise(SIG_CLICK);
+}
+
-- 
2.39.2