Guard against null pointers

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

diff --git a/source/root.cpp b/source/root.cpp
index bce6adf8f7a9799fd9811696969737cc6ddc178f..1b47e8a0ff3843fb645d5ef6abffdb076b62de8f 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -9,24 +9,55 @@
 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));
+       if(mouse)
+       {
+               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));
+       }
+
+       if(keyboard)
+       {
+               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()
@@ -81,30 +112,45 @@ void Root::render() const
        GL::MatrixStack::modelview() = GL::Matrix();
        GL::Bind bind_blend(GL::Blend::alpha());
 
-       Widget::render();
+       GL::Renderer renderer(0);
+       Widget::render(renderer);
 }
 
-void Root::button_press_event(unsigned btn)
+bool Root::button_press_event(unsigned btn)
 {
        if(visible)
        {
+               Widget *old_focus = pointer_focus;
+
                int x, y;
                get_pointer(x, y);
                button_press(x, y, btn);
+
+               if(pointer_focus || old_focus)
+                       return true;
        }
+
+       return false;
 }
 
-void Root::button_release_event(unsigned btn)
+bool Root::button_release_event(unsigned btn)
 {
        if(visible)
        {
+               Widget *old_focus = pointer_focus;
+
                int x, y;
                get_pointer(x, y);
                button_release(x, y, btn);
+
+               if(pointer_focus || old_focus)
+                       return true;
        }
+
+       return false;
 }
 
-void Root::axis_motion_event(unsigned, float, float)
+bool Root::axis_motion_event(unsigned, float, float)
 {
        if(visible)
        {
@@ -124,32 +170,64 @@ void Root::axis_motion_event(unsigned, float, float)
                                lbl_tooltip->set_visible(false);
                        tooltip_target = 0;
                }
+
+               if(pointer_focus)
+                       return true;
        }
+
+       return false;
 }
 
-void Root::key_press_event(unsigned key)
+bool Root::key_press_event(unsigned key)
 {
        // XXX Modifiers
        if(visible)
+       {
+               Widget *old_focus = input_focus;
+
                key_press(key, 0);
+
+               if(input_focus || old_focus)
+                       return true;
+       }
+
+       return false;
 }
 
-void Root::key_release_event(unsigned key)
+bool Root::key_release_event(unsigned key)
 {
        if(visible)
+       {
+               Widget *old_focus = input_focus;
+
                key_release(key, 0);
+
+               if(input_focus || old_focus)
+                       return true;
+       }
+
+       return false;
 }
 
-void Root::character_event(StringCodec::unichar ch)
+bool Root::character_event(StringCodec::unichar ch)
 {
        if(visible)
+       {
+               Widget *old_focus = input_focus;
+
                character(ch);
+
+               if(input_focus || old_focus)
+                       return true;
+       }
+
+       return false;
 }
 
 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