X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=713477488a13ce6a5c2954c5daba94cc318ff487;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=89db305ea5bd291e7cfc9823c7a5a2964a837ec6;hpb=d9d787503ae41842309f74a2eabc5b848abe1f22;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index 89db305..7134774 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -1,51 +1,90 @@ #include +#include +#include +#include +#include #include -#include #include #include "label.h" #include "style.h" #include "root.h" +#include "systemkeyboardinput.h" namespace Msp { namespace GLtk { -Root::Root(const Resources &r, Graphics::Window &window): +Root::Root(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) { - set_geometry(Geometry(0, 0, window.get_width(), window.get_height())); - - init(); + init(&window); } -Root::Root(const Resources &r, 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), + input_method(0), mouse(m), + touchscreen(t), own_input(false) { - init(); + init(window); } -void Root::init() +void Root::init(Graphics::Window *window) { + 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(); + + if(GL::ARB_shader_objects) + { + shprog = new GL::Program; + GL::ProgramBuilder::StandardFeatures features; + features.material = true; + features.texture = true; + GL::ProgramBuilder(features).add_shaders(*shprog); + shprog->link(); + } + else + shprog = 0; + + if(keyboard) + set_state(FOCUS); + 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 && !input_method) + input_method = new SystemKeyboardInput(*this, *keyboard); + + if(touchscreen) + { + 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; @@ -55,6 +94,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; @@ -101,35 +146,61 @@ void Root::tick() void Root::render() const { - GL::MatrixStack::projection() = GL::Matrix::ortho_bottomleft(geom.w, geom.h); - GL::MatrixStack::modelview() = GL::Matrix(); GL::Bind bind_blend(GL::Blend::alpha()); - GL::Renderer renderer(0); + GL::Renderer renderer(&camera); + renderer.set_shader_program(shprog); Widget::render(renderer); } -void Root::button_press_event(unsigned btn) +void Root::render(GL::Renderer &renderer, const GL::Tag &tag) const +{ + if(tag.id) + return; + + GL::Renderer::Push push(renderer); + renderer.set_camera(camera); + renderer.set_shader_program(shprog); + GL::BindRestore bind_blend(GL::Blend::alpha()); + GL::BindRestore unbind_dtest(static_cast(0)); + Widget::render(renderer); +} + +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) { @@ -149,26 +220,62 @@ 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::touch_press_event(unsigned finger) { - // XXX Modifiers if(visible) - key_press(key, 0); + { + Widget *old_focus = touch_focus; + + int x, y; + get_touch(finger, x, y); + touch_press(x, y, finger); + + if(touch_focus || old_focus) + return true; + } + + return false; } -void Root::key_release_event(unsigned key) +bool Root::touch_release_event(unsigned finger) { if(visible) - key_release(key, 0); + { + Widget *old_focus = touch_focus; + + int x, y; + get_touch(finger, x, y); + touch_release(x, y, finger); + + if(touch_focus || old_focus) + return true; + } + + return false; } -void Root::character_event(StringCodec::unichar ch) +bool Root::touch_motion_event(unsigned axis, float, float) { if(visible) - character(ch); + { + unsigned finger = axis/2; + int x, y; + get_touch(finger, x, y); + touch_motion(x, y, finger); + + if(touch_focus) + return true; + } + + return false; } void Root::get_pointer(int &x, int &y) @@ -177,5 +284,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