]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/container.cpp
Defer widget rebuild to just before they are rendered
[libs/gltk.git] / source / container.cpp
index e8b666d67344e854cedf0d948fe6f38d2874eab8..28e0e2feafff2105017c61bb35dda55656cf6d0e 100644 (file)
@@ -1,4 +1,5 @@
 #include "container.h"
+#include "part.h"
 
 using namespace std;
 
@@ -15,7 +16,10 @@ Container::Container():
        click_button(0),
        pointer_focus(0),
        pointer_grabbed(false),
-       input_focus(0)
+       input_focus(0),
+       saved_input_focus(0),
+       touch_focus(0),
+       children_rebuild_needed(false)
 { }
 
 Container::~Container()
@@ -28,6 +32,9 @@ void Container::add(Widget &wdg)
 {
        wdg.set_parent(this);
        children.push_back(create_child(&wdg));
+       if(wdg.get_animation_interval())
+               check_animation_interval();
+       children_rebuild_needed = true;
        on_child_added(wdg);
 }
 
@@ -39,6 +46,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;
                }
@@ -51,6 +60,36 @@ Container::Child *Container::create_child(Widget *wdg)
        return new Child(*this, wdg);
 }
 
+Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const
+{
+       Geometry pgeom = part.get_geometry();
+       if(!pgeom.w || !pgeom.h)
+       {
+               Geometry cgeom;
+               child.autosize(cgeom);
+               if(!pgeom.w)
+                       pgeom.w = cgeom.w;
+               if(!pgeom.h)
+                       pgeom.h = cgeom.h;
+       }
+
+       part.get_alignment().apply(pgeom, geom, part.get_margin());
+       return pgeom;
+}
+
+void Container::autosize_child(const Widget &child, const Part &part, Geometry &ageom) const
+{
+       Geometry cgeom = determine_child_geometry(child, part);
+       const Sides &margin = part.get_margin();
+       ageom.w = max(ageom.w, cgeom.w+margin.left+margin.right);
+       ageom.h = max(ageom.h, cgeom.h+margin.top+margin.bottom);
+}
+
+void Container::reposition_child(Widget &child, const Part &part) const
+{
+       child.set_geometry(determine_child_geometry(child, part));
+}
+
 list<Widget *> Container::get_children() const
 {
        list<Widget *> result;
@@ -59,16 +98,16 @@ list<Widget *> Container::get_children() const
        return result;
 }
 
-Widget *Container::get_child_at(int x, int y)
+Widget *Container::get_child_at(int x, int y) const
 {
-       for(list<Child *>::iterator i=children.end(); i!=children.begin();)
+       for(list<Child *>::const_iterator i=children.end(); i!=children.begin();)
                if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
                        return (*i)->widget;
 
        return 0;
 }
 
-Widget *Container::get_descendant_at(int x, int y)
+Widget *Container::get_descendant_at(int x, int y) const
 {
        Widget *wdg = get_child_at(x, y);
        if(Container *cont = dynamic_cast<Container *>(wdg))
@@ -93,7 +132,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)
        {
@@ -101,10 +140,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)
@@ -115,12 +157,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();
-               }
        }
 }
 
@@ -133,9 +173,35 @@ Widget *Container::get_final_input_focus() const
        return input_focus;
 }
 
+void Container::check_animation_interval()
+{
+       Time::TimeDelta shortest;
+       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+       {
+               const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+               if(child_iv && (!shortest || child_iv<shortest))
+                       shortest = child_iv;
+       }
+
+       if(shortest!=anim_interval)
+               set_animation_interval(shortest);
+}
+
+void Container::rebuild_hierarchy()
+{
+       Widget::rebuild_hierarchy();
+
+       if(children_rebuild_needed)
+       {
+               children_rebuild_needed = false;
+               for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+                       (*i)->widget->rebuild_hierarchy();
+       }
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
-       if(Widget *child = get_pointer_target(x, y))
+       if(Widget *child = get_pointer_target(x, y, false))
        {
                if(!click_focus)
                {
@@ -154,7 +220,7 @@ void Container::button_press(int x, int y, unsigned btn)
 
 void Container::button_release(int x, int y, unsigned btn)
 {
-       if(Widget *child = get_pointer_target(x, y))
+       if(Widget *child = get_pointer_target(x, y, false))
        {
                if(child==click_focus && btn==click_button)
                {
@@ -170,9 +236,9 @@ void Container::button_release(int x, int y, unsigned btn)
 
 void Container::pointer_motion(int x, int y)
 {
-       Widget *child = get_pointer_target(x, y);
+       Widget *child = get_pointer_target(x, y, false);
        if(!pointer_grabbed)
-               set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0);
+               set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
 
        if(child)
        {
@@ -181,14 +247,22 @@ void Container::pointer_motion(int x, int y)
        }
 }
 
-Widget *Container::get_pointer_target(int x, int y)
+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
-               return get_child_at(x, y);
+       {
+               Widget *child = get_child_at(x, y);
+               if(child && child->is_enabled())
+                       return child;
+               else
+                       return 0;
+       }
 }
 
 void Container::pointer_leave()
@@ -197,30 +271,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->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->key_press(key, 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<Child *>::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<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
@@ -231,6 +380,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),
@@ -240,6 +395,8 @@ 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));
+       widget->signal_rebuild_needed.connect(sigc::mem_fun(this, &Child::rebuild_needed));
 }
 
 Container::Child::~Child()
@@ -262,17 +419,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();
        }
 }
@@ -283,10 +440,22 @@ 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();
+}
+
+void Container::Child::rebuild_needed()
+{
+       container.children_rebuild_needed = true;
+       container.signal_rebuild_needed.emit();
+}
+
 } // namespace GLtk
 } // namespace Msp