Add an input method subsystem

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

diff --git a/source/root.cpp b/source/root.cpp
index 8b06f4788f9f4ae45b8837ed63f6c1569b8bc62a..b4c16cfe8bf7973ded8a5f2b387b23c189f80bbd 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -8,6 +8,7 @@
 #include "label.h"
 #include "style.h"
 #include "root.h"
+#include "systemkeyboardinput.h"
 
 namespace Msp {
 namespace GLtk {
@@ -15,16 +16,20 @@ namespace GLtk {
 Root::Root(const Resources &r, Graphics::Window &window):
        resources(r),
        keyboard(new Input::Keyboard(window)),
+       input_method(0),
        mouse(new Input::Mouse(window)),
+       touchscreen(0),
        own_input(true)
 {
        init(&window);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m):
+Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
        resources(r),
        keyboard(k),
+       input_method(0),
        mouse(m),
+       touchscreen(t),
        own_input(false)
 {
        init(window);
@@ -62,17 +67,21 @@ void Root::init(Graphics::Window *window)
                mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
        }
 
-       if(keyboard)
+       if(keyboard && !input_method)
+               input_method = new SystemKeyboardInput(*this, *keyboard);
+
+       if(touchscreen)
        {
-               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));
+               touchscreen->signal_button_press.connect(sigc::mem_fun(this, &Root::touch_press_event));
+               touchscreen->signal_button_release.connect(sigc::mem_fun(this, &Root::touch_release_event));
+               touchscreen->signal_axis_motion.connect(sigc::mem_fun(this, &Root::touch_motion_event));
        }
 }
 
 Root::~Root()
 {
        delete shprog;
+       delete input_method;
        if(own_input)
        {
                delete keyboard;
@@ -197,46 +206,50 @@ bool Root::axis_motion_event(unsigned, float, float)
        return false;
 }
 
-bool Root::key_press_event(unsigned key)
+bool Root::touch_press_event(unsigned finger)
 {
-       // XXX Modifiers
        if(visible)
        {
-               Widget *old_focus = input_focus;
+               Widget *old_focus = touch_focus;
 
-               key_press(key, 0);
+               int x, y;
+               get_touch(finger, x, y);
+               touch_press(x, y, finger);
 
-               if(input_focus || old_focus)
+               if(touch_focus || old_focus)
                        return true;
        }
 
        return false;
 }
 
-bool Root::key_release_event(unsigned key)
+bool Root::touch_release_event(unsigned finger)
 {
        if(visible)
        {
-               Widget *old_focus = input_focus;
+               Widget *old_focus = touch_focus;
 
-               key_release(key, 0);
+               int x, y;
+               get_touch(finger, x, y);
+               touch_release(x, y, finger);
 
-               if(input_focus || old_focus)
+               if(touch_focus || old_focus)
                        return true;
        }
 
        return false;
 }
 
-bool Root::character_event(StringCodec::unichar ch)
+bool Root::touch_motion_event(unsigned axis, float, float)
 {
        if(visible)
        {
-               Widget *old_focus = input_focus;
-
-               character(ch);
+               unsigned finger = axis/2;
+               int x, y;
+               get_touch(finger, x, y);
+               touch_motion(x, y, finger);
 
-               if(input_focus || old_focus)
+               if(touch_focus)
                        return true;
        }
 
@@ -249,6 +262,12 @@ void Root::get_pointer(int &x, int &y)
        y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
 }
 
+void Root::get_touch(unsigned finger, int &x, int &y)
+{
+       x = (touchscreen->get_axis_value(finger*2)*0.5+0.5)*geom.w;
+       y = (touchscreen->get_axis_value(finger*2+1)*0.5+0.5)*geom.h;
+}
+
 void Root::update_camera()
 {
        camera.set_position(GL::Vector3(geom.w/2.0f, geom.h/2.0f, geom.h/2.0f));