Adjust event handling to match changes in mspgui

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

diff --git a/source/root.cpp b/source/root.cpp
index 826a5403dee110a77ed54d5e48640233124d10c7..bce6adf8f7a9799fd9811696969737cc6ddc178f 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -12,6 +12,8 @@ namespace GLtk {
 Root::Root(const Resources &r, Graphics::Window &w):
        resources(r),
        window(w),
+       keyboard(window),
+       mouse(window),
        lbl_tooltip(0),
        tooltip_target(0)
 {
@@ -19,11 +21,12 @@ Root::Root(const Resources &r, Graphics::Window &w):
 
        update_style();
 
-       window.signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
-       window.signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
-       window.signal_pointer_motion.connect(sigc::mem_fun(this, &Root::pointer_motion_event));
-       window.signal_key_press.connect(sigc::mem_fun(this, &Root::key_press_event));
-       window.signal_key_release.connect(sigc::mem_fun(this, &Root::key_release_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));
 }
 
 void Root::tick()
@@ -81,39 +84,32 @@ void Root::render() const
        Widget::render();
 }
 
-void Root::button_press_event(int x, int y, unsigned btn, unsigned mod)
+void Root::button_press_event(unsigned btn)
 {
        if(visible)
        {
-               Widget *old_focus = pointer_focus;
-
-               translate_coords(x, y);
+               int x, y;
+               get_pointer(x, y);
                button_press(x, y, btn);
-
-               if(!pointer_focus && !old_focus)
-                       signal_button_press.emit(x, geom.h-1-y, btn, mod);
        }
 }
 
-void Root::button_release_event(int x, int y, unsigned btn, unsigned mod)
+void Root::button_release_event(unsigned btn)
 {
        if(visible)
        {
-               Widget *old_focus = pointer_focus;
-
-               translate_coords(x, y);
+               int x, y;
+               get_pointer(x, y);
                button_release(x, y, btn);
-
-               if(!pointer_focus && !old_focus)
-                       signal_button_release.emit(x, geom.h-1-y, btn, mod);
        }
 }
 
-void Root::pointer_motion_event(int x, int y)
+void Root::axis_motion_event(unsigned, float, float)
 {
        if(visible)
        {
-               translate_coords(x, y);
+               int x, y;
+               get_pointer(x, y);
                pointer_motion(x, y);
 
                if(!tooltip_target)
@@ -128,42 +124,32 @@ void Root::pointer_motion_event(int x, int y)
                                lbl_tooltip->set_visible(false);
                        tooltip_target = 0;
                }
-
-               if(!pointer_focus)
-                       signal_pointer_motion.emit(x, geom.h-1-y);
        }
 }
 
-void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch)
+void Root::key_press_event(unsigned key)
 {
+       // XXX Modifiers
        if(visible)
-       {
-               Widget *old_focus = input_focus;
-
-               key_press(Input::key_from_sys(key), mod, ch);
-
-               if(!input_focus && !old_focus)
-                       signal_key_press.emit(key, mod, ch);
-       }
+               key_press(key, 0);
 }
 
-void Root::key_release_event(unsigned key, unsigned mod)
+void Root::key_release_event(unsigned key)
 {
        if(visible)
-       {
-               Widget *old_focus = input_focus;
-
-               key_release(Input::key_from_sys(key), mod);
+               key_release(key, 0);
+}
 
-               if(!input_focus && !old_focus)
-                       signal_key_release.emit(key, mod);
-       }
+void Root::character_event(StringCodec::unichar ch)
+{
+       if(visible)
+               character(ch);
 }
 
-void Root::translate_coords(int &x, int &y)
+void Root::get_pointer(int &x, int &y)
 {
-       x = x*geom.w/window.get_width();
-       y = geom.h-1-y*geom.h/window.get_height();
+       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