X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=e7c0a9251eadebfe8863e3549e4571737c0b24aa;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=c7a2657005426ecc0f20eff1de7c9f8cb18a0e86;hpb=c72566cd7f8252eb386c753ceeafa8a324d1120b;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index c7a2657..e7c0a92 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -1,10 +1,4 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include #include #include #include @@ -16,9 +10,10 @@ namespace Msp { namespace GLtk { Root::Root(const Resources &r, Graphics::Window &w): - Widget(r), - Panel(r), + resources(r), window(w), + keyboard(window), + mouse(window), lbl_tooltip(0), tooltip_target(0) { @@ -26,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() @@ -38,130 +34,123 @@ void Root::tick() if(tooltip_timeout && Time::now()>tooltip_timeout) { std::string tip; - if(Widget *wdg=get_descendant_at(pointer_x, pointer_y)) + if(Widget *wdg = get_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); + lbl_tooltip = new Label; add(*lbl_tooltip); lbl_tooltip->set_style("tooltip"); } lbl_tooltip->set_text(tip); lbl_tooltip->autosize(); - const Geometry &tip_geom=lbl_tooltip->get_geometry(); - unsigned x=pointer_x+10; - unsigned y=pointer_y-10-lbl_tooltip->get_geometry().h; + const Geometry &tip_geom = lbl_tooltip->get_geometry(); + unsigned x = pointer_x+10; + unsigned y = pointer_y-10-lbl_tooltip->get_geometry().h; if(x+tip_geom.w>geom.w) { if(pointer_x>static_cast(tip_geom.w+2)) - x=pointer_x-2-tip_geom.w; + x = pointer_x-2-tip_geom.w; else - x=geom.w-tip_geom.w; + x = geom.w-tip_geom.w; } lbl_tooltip->set_position(x, y); raise(*lbl_tooltip); lbl_tooltip->set_visible(true); } - tooltip_timeout=Time::TimeStamp(); + tooltip_timeout = Time::TimeStamp(); } } -void Root::button_press_event(int x, int y, unsigned btn, unsigned mod) +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); + Widget::render(renderer); +} + +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) { - pointer_x=x; - pointer_y=y; - tooltip_timeout=Time::now()+700*Time::msec; + pointer_x = x; + pointer_y = y; + tooltip_timeout = Time::now()+700*Time::msec; } else if(get_descendant_at(x, y)!=tooltip_target) { if(lbl_tooltip) lbl_tooltip->set_visible(false); - tooltip_target=0; + 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