X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=03dff1137bfdf6416f6d755c61bae65604f8733b;hb=5bb0cc92a28a7862571249a2512bcd23ed272344;hp=b7bd2ad5dc9b06f7eb88c08db4fd90b43356c781;hpb=36fced66c1ea8962e148ebddc0e021a8aedfc310;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index b7bd2ad..03dff11 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -16,7 +16,9 @@ Container::Container(): click_button(0), pointer_focus(0), pointer_grabbed(false), - input_focus(0) + input_focus(0), + saved_input_focus(0), + touch_focus(0) { } Container::~Container() @@ -29,6 +31,8 @@ void Container::add(Widget &wdg) { wdg.set_parent(this); children.push_back(create_child(&wdg)); + if(wdg.get_animation_interval()) + check_animation_interval(); on_child_added(wdg); } @@ -40,6 +44,8 @@ void Container::remove(Widget &wdg) wdg.set_parent(0); delete *i; children.erase(i); + if(wdg.get_animation_interval()) + check_animation_interval(); on_child_removed(wdg); return; } @@ -146,12 +152,10 @@ void Container::set_input_focus(Widget *wdg) input_focus->focus_out(); input_focus = wdg; + on_input_focus_changed(input_focus); if(input_focus) - { - raise(*wdg); input_focus->focus_in(); - } } } @@ -164,9 +168,23 @@ Widget *Container::get_final_input_focus() const return input_focus; } +void Container::check_animation_interval() +{ + Time::TimeDelta shortest; + for(list::const_iterator i=children.begin(); i!=children.end(); ++i) + { + const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval(); + if(child_iv && (!shortest || child_ivget_geometry().is_inside(x, y)) ? child : 0); @@ -212,12 +230,14 @@ void Container::pointer_motion(int x, int y) } } -Widget *Container::get_pointer_target(int x, int y) const +Widget *Container::get_pointer_target(int x, int y, bool touch) const { if(pointer_grabbed) return pointer_focus; - else if(click_focus) + else if(!touch && click_focus) return click_focus; + else if(touch && touch_focus) + return touch_focus; else { Widget *child = get_child_at(x, y); @@ -234,30 +254,105 @@ void Container::pointer_leave() set_pointer_focus(0); } -void Container::key_press(unsigned key, unsigned mod) +void Container::touch_press(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + // TODO track focus for each finger separately + if(!touch_focus) + touch_focus = child; + + const Geometry &cgeom = child->get_geometry(); + child->touch_press(x-cgeom.x, y-cgeom.y, finger); + } +} + +void Container::touch_release(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + // TODO track focus for each finger separately + if(child==touch_focus) + touch_focus = 0; + + const Geometry &cgeom = child->get_geometry(); + child->touch_release(x-cgeom.x, y-cgeom.y, finger); + } +} + +void Container::touch_motion(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + const Geometry &cgeom = child->get_geometry(); + child->touch_motion(x-cgeom.x, y-cgeom.y, finger); + } +} + +bool Container::key_press(unsigned key, unsigned mod) { - if(input_focus) - input_focus->key_press(key, mod); + if(input_focus && input_focus->is_enabled()) + return input_focus->key_press(key, mod); + else + return false; +} + +bool Container::key_release(unsigned key, unsigned mod) +{ + if(input_focus && input_focus->is_enabled()) + return input_focus->key_release(key, mod); + else + return false; } -void Container::key_release(unsigned key, unsigned mod) +bool Container::character(wchar_t ch) { - if(input_focus) - input_focus->key_release(key, mod); + if(input_focus && input_focus->is_enabled()) + return input_focus->character(ch); + else + return false; } -void Container::character(wchar_t ch) +void Container::focus_in() { - if(input_focus) - input_focus->character(ch); + if(saved_input_focus && saved_input_focus->get_parent()==this) + set_input_focus(saved_input_focus); + Widget::focus_in(); } void Container::focus_out() { + saved_input_focus = input_focus; set_input_focus(0); Widget::focus_out(); } +bool Container::navigate(Navigation nav) +{ + if(input_focus && input_focus->is_enabled()) + return input_focus->navigate(nav); + else + return false; +} + +void Container::animate(const Time::TimeDelta &dt) +{ + for(list::iterator i=children.begin(); i!=children.end(); ++i) + { + const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval(); + if(!child_iv) + continue; + + (*i)->time_since_animate += dt; + if((*i)->time_since_animate>=child_iv) + { + Time::TimeDelta child_dt = (*i)->time_since_animate; + (*i)->time_since_animate = min((*i)->time_since_animate-child_iv, child_iv); + (*i)->widget->animate(child_dt); + } + } +} + void Container::on_reparent() { for(list::iterator i=children.begin(); i!=children.end(); ++i) @@ -268,6 +363,12 @@ void Container::on_reparent() } } +void Container::on_input_focus_changed(Widget *wdg) +{ + if(wdg) + raise(*wdg); +} + Container::Child::Child(Container &c, Widget *w): container(c), @@ -277,6 +378,7 @@ Container::Child::Child(Container &c, Widget *w): widget->signal_request_focus.connect(sigc::mem_fun(this, &Child::request_focus)); widget->signal_grab_pointer.connect(sigc::mem_fun(this, &Child::grab_pointer)); widget->signal_ungrab_pointer.connect(sigc::mem_fun(this, &Child::ungrab_pointer)); + widget->signal_request_animation.connect(sigc::mem_fun(this, &Child::request_animation)); } Container::Child::~Child() @@ -299,9 +401,10 @@ void Container::Child::visibility_changed(bool v) void Container::Child::request_focus() { - container.set_input_focus(widget); if(container.parent && container.visible) container.set_focus(); + if(container.state&FOCUS) + container.set_input_focus(widget); } void Container::Child::grab_pointer() @@ -325,5 +428,12 @@ void Container::Child::ungrab_pointer() } } +void Container::Child::request_animation(const Time::TimeDelta &interval) +{ + if(!interval) + time_since_animate = Time::zero; + container.check_animation_interval(); +} + } // namespace GLtk } // namespace Msp