X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=5ea447fecdf46d48f0013aa3f832e5aef9fe8348;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=eaf58194863a961e209f22ee175c90b1ac852aac;hpb=358f45ef39381b4eb4f37dc6c20e52fd07c0fbcf;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index eaf5819..5ea447f 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -1,39 +1,41 @@ #include #include -#include #include #include "label.h" #include "style.h" +#include "resources.h" #include "root.h" +#include "systemkeyboardinput.h" namespace Msp { namespace GLtk { -Root::Root(const Resources &r, Graphics::Window &window): - resources(r), - keyboard(new Input::Keyboard(window)), - mouse(new Input::Mouse(window)), - own_input(true) +Root::Root(Resources &r, Graphics::Window &window): + Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), 0) { - init(&window); + own_input = true; } -Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m): +Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t): resources(r), keyboard(k), mouse(m), - own_input(false) -{ - init(window); -} - -void Root::init(Graphics::Window *window) + touchscreen(t) { if(window) set_geometry(Geometry(0, 0, window->get_width(), window->get_height())); - lbl_tooltip = 0; - tooltip_target = 0; + camera.set_orthographic(geom.w, geom.h); + update_camera(); + + shprog = &resources.get("ui.shader"); + + blend.enabled = true; + blend.src_factor = GL::SRC_ALPHA; + blend.dst_factor = GL::ONE_MINUS_SRC_ALPHA; + + if(keyboard) + set_state(FOCUS); update_style(); @@ -44,16 +46,20 @@ 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 input_method; if(own_input) { delete keyboard; @@ -63,6 +69,12 @@ Root::~Root() void Root::tick() { + Time::TimeStamp t = Time::now(); + Time::TimeDelta dt = (last_tick ? t-last_tick : Time::zero); + last_tick = t; + + animate(dt); + if(tooltip_timeout && Time::now()>tooltip_timeout) { std::string tip; @@ -107,13 +119,21 @@ void Root::tick() } } -void Root::render() const +void Root::setup_frame(GL::Renderer &) { - GL::MatrixStack::projection() = GL::Matrix::ortho_bottomleft(geom.w, geom.h); - GL::MatrixStack::modelview() = GL::Matrix(); - GL::Bind bind_blend(GL::Blend::alpha()); + rebuild_hierarchy(); +} - GL::Renderer renderer(0); +void Root::render(GL::Renderer &renderer, GL::Tag tag) const +{ + if(tag.id) + return; + + GL::Renderer::Push push(renderer); + renderer.set_camera(camera); + renderer.set_shader_program(shprog); + renderer.set_blend(&blend); + renderer.set_depth_test(0); Widget::render(renderer); } @@ -179,46 +199,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; } @@ -231,5 +255,30 @@ 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)); + camera.set_depth_clip(geom.h*0.1f, geom.h*0.9f); + camera.set_orthographic(geom.w, geom.h); +} + +void Root::on_size_change() +{ + Panel::on_size_change(); + update_camera(); +} + +void Root::on_child_added(Widget &wdg) +{ + if(&wdg!=lbl_tooltip) + Panel::on_child_added(wdg); +} + } // namespace GLtk } // namespace Msp