X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=16ed5bd58c1d9f94a22236b8900c1db8a1be0831;hb=HEAD;hp=c7a2657005426ecc0f20eff1de7c9f8cb18a0e86;hpb=c72566cd7f8252eb386c753ceeafa8a324d1120b;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index c7a2657..16ed5bd 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -1,167 +1,279 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include #include -#include #include #include "label.h" #include "style.h" +#include "resources.h" #include "root.h" +#include "systemkeyboardinput.h" + +using namespace std; namespace Msp { namespace GLtk { -Root::Root(const Resources &r, Graphics::Window &w): - Widget(r), - Panel(r), - window(w), - lbl_tooltip(0), - tooltip_target(0) +Root::Root(Resources &r, Graphics::Window &window, unique_ptr k, unique_ptr m): + Root(r, &window, k.get(), m.get(), nullptr) +{ + own_input[0] = move(k); + own_input[1] = move(m); +} + +Root::Root(Resources &r, Graphics::Window &window): + Root(r, window, make_unique(window), make_unique(window)) +{ } + +Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t): + resources(r), + keyboard(k), + mouse(m), + touchscreen(t) { - set_geometry(Geometry(0, 0, window.get_width(), window.get_height())); + if(window) + set_geometry(Geometry(0, 0, window->get_width(), window->get_height())); + + 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(); - 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)); + 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 = make_unique(*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)); + } } 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; - if(Widget *wdg=get_descendant_at(pointer_x, pointer_y)) + if(Widget *wdg = find_descendant_at(pointer_x, pointer_y)) { - tip=wdg->get_tooltip(); - tooltip_target=wdg; + tip = wdg->get_tooltip(); + tooltip_target = wdg; } else { - tip=signal_tooltip.emit(pointer_x, pointer_y); - tooltip_target=this; + tip = signal_tooltip.emit(pointer_x, pointer_y); + tooltip_target = this; } if(!tip.empty()) { if(!lbl_tooltip) { - lbl_tooltip=new Label(res); - add(*lbl_tooltip); + lbl_tooltip = &add_new