X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=e99d9939aefdf0b951feba1572804d95e38bd5cf;hb=ecc3ffc4433f14534560bbe51441e7f02e42a0c1;hp=21d31fb0e2af7a988159a74895cfddc863e8c536;hpb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index 21d31fb..e99d993 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -17,6 +17,7 @@ Container::Container(): pointer_focus(0), pointer_grabbed(false), input_focus(0), + saved_input_focus(0), touch_focus(0) { } @@ -30,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); } @@ -41,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; } @@ -125,7 +130,7 @@ void Container::raise(Widget &wdg) throw hierarchy_error("widget not in container"); } -void Container::set_pointer_focus(Widget *wdg) +void Container::set_pointer_focus(Widget *wdg, bool grab) { if(wdg!=pointer_focus) { @@ -133,10 +138,13 @@ void Container::set_pointer_focus(Widget *wdg) pointer_focus->pointer_leave(); pointer_focus = wdg; + pointer_grabbed = grab; if(pointer_focus) pointer_focus->pointer_enter(); } + else + pointer_grabbed = grab; } void Container::set_input_focus(Widget *wdg) @@ -147,12 +155,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(); - } } } @@ -165,6 +171,20 @@ 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); + set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0); if(child) { @@ -237,24 +257,6 @@ void Container::pointer_leave() set_pointer_focus(0); } -void Container::key_press(unsigned key, unsigned mod) -{ - if(input_focus) - input_focus->key_press(key, mod); -} - -void Container::key_release(unsigned key, unsigned mod) -{ - if(input_focus) - input_focus->key_release(key, mod); -} - -void Container::character(wchar_t ch) -{ - if(input_focus) - input_focus->character(ch); -} - void Container::touch_press(int x, int y, unsigned finger) { if(Widget *child = get_pointer_target(x, y, true)) @@ -290,12 +292,70 @@ void Container::touch_motion(int x, int y, unsigned finger) } } +bool Container::key_press(unsigned key, unsigned 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; +} + +bool Container::character(wchar_t ch) +{ + if(input_focus && input_focus->is_enabled()) + return input_focus->character(ch); + else + return false; +} + +void Container::focus_in() +{ + 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) @@ -306,6 +366,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), @@ -315,6 +381,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() @@ -337,17 +404,17 @@ 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() { if(!container.pointer_grabbed) { - container.set_pointer_focus(widget); - container.pointer_grabbed = true; + container.set_pointer_focus(widget, true); container.signal_grab_pointer.emit(); } } @@ -358,10 +425,16 @@ void Container::Child::ungrab_pointer() { // XXX Should set to the widget under pointer container.set_pointer_focus(0); - container.pointer_grabbed = false; container.signal_ungrab_pointer.emit(); } } +void Container::Child::request_animation(const Time::TimeDelta &interval) +{ + if(!interval) + time_since_animate = Time::zero; + container.check_animation_interval(); +} + } // namespace GLtk } // namespace Msp