Allow Root widgets to be created with custom input devices

[libs/gltk.git] / source / root.cpp

diff --git a/source/root.cpp b/source/root.cpp
index e7c0a9251eadebfe8863e3549e4571737c0b24aa..89db305ea5bd291e7cfc9823c7a5a2964a837ec6 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -9,24 +9,48 @@
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &w):
+Root::Root(const Resources &r, Graphics::Window &window):
        resources(r),
-       window(w),
-       keyboard(window),
-       mouse(window),
-       lbl_tooltip(0),
-       tooltip_target(0)
+       keyboard(new Input::Keyboard(window)),
+       mouse(new Input::Mouse(window)),
+       own_input(true)
 {
        set_geometry(Geometry(0, 0, window.get_width(), window.get_height()));
 
+       init();
+}
+
+Root::Root(const Resources &r, Input::Keyboard *k, Input::Mouse *m):
+       resources(r),
+       keyboard(k),
+       mouse(m),
+       own_input(false)
+{
+       init();
+}
+
+void Root::init()
+{
+       lbl_tooltip = 0;
+       tooltip_target = 0;
+
        update_style();
 
-       mouse.signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
-       mouse.signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
-       mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
-       keyboard.signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event));
-       keyboard.signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event));
-       keyboard.signal_character.connect(sigc::mem_fun(this, &Root::character_event));
+       mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
+       mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
+       mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
+       keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event));
+       keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event));
+       keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event));
+}
+
+Root::~Root()
+{
+       if(own_input)
+       {
+               delete keyboard;
+               delete mouse;
+       }
 }
 
 void Root::tick()
@@ -149,8 +173,8 @@ void Root::character_event(StringCodec::unichar ch)
 
 void Root::get_pointer(int &x, int &y)
 {
-       x = (mouse.get_axis_value(0)*0.5+0.5)*geom.w;
-       y = (mouse.get_axis_value(1)*0.5+0.5)*geom.h;
+       x = (mouse->get_axis_value(0)*0.5+0.5)*geom.w;
+       y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
 }
 
 } // namespace GLtk