widget: don't crash when deallocating in wrong order

[enigma2.git] / lib / gui / ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 89fbfe95f59dfa3d79e8a18f863dd9aae83c54c6..3bc6e663841e940e1d7506f7baf4722c90f01a24 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,34 +3,81 @@
 
 extern void dumpRegion(const gRegion &region);
 
 
 extern void dumpRegion(const gRegion &region);
 

-eWidget::eWidget(eWidget *parent): m_parent(parent)
+eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)

 {
        m_vis = 0;
        m_desktop = 0;
 {
        m_vis = 0;
        m_desktop = 0;

+       m_have_background_color = 0;
+       m_z_position = 0;

        
        

-       if (parent)
+       m_client_offset = eSize(0, 0);
+       
+       if (m_parent)

                m_vis = wVisShow;
        
                m_vis = wVisShow;
        

-       if (parent)
-               parent->m_childs.push_back(this);
+       if (m_parent)
+       {
+               insertIntoParent();
+               m_parent->getStyle(m_style);
+       }
+
+       m_current_focus = 0;
+       m_focus_owner = 0;

 }
 
 void eWidget::move(ePoint pos)
 {
 }
 
 void eWidget::move(ePoint pos)
 {

+       pos = pos + m_client_offset;
+       
+       if (m_position == pos)
+               return;
+
+                       /* ?? what about native move support? */
+       invalidate();
+

        m_position = pos;
        
        event(evtChangedPosition);
        m_position = pos;
        
        event(evtChangedPosition);

+       recalcClipRegionsWhenVisible();
+       
+               /* try native move if supported. */
+       if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this)))
+               invalidate();

 }
 
 void eWidget::resize(eSize size)
 {
 }
 
 void eWidget::resize(eSize size)
 {

-       event(evtWillChangeSize, &size);
+               /* same strategy as with move: we first check if
+                  the size changed at all, and if it did, we
+                  invalidate both the old and new area. 
+                  TODO: check if either the old or new area
+                  fits into the other completely, and invalidate
+                  only once. */
+       eSize old_size = m_size;
+       eSize old_offset = m_client_offset;
+       m_client_offset = eSize(0, 0);
+       event(evtWillChangeSize, &size, &m_client_offset);
+       if (old_size == m_size)
+               return;
+       
+       move(position() - old_offset);
+       
+       invalidate();

        event(evtChangedSize);
        event(evtChangedSize);

+       recalcClipRegionsWhenVisible(); 
+       invalidate();

 }
 
 void eWidget::invalidate(const gRegion &region)
 {
 }
 
 void eWidget::invalidate(const gRegion &region)
 {

-       gRegion res = /* region & */ m_visible_with_childs;
+               /* we determine the area to redraw, and re-position this
+                  area to the absolute position, and then call the
+                  desktop's invalidate() with that, which adds this
+                  area into the dirty region. */
+       gRegion res = m_visible_with_childs;
+       if (region.valid())
+               res &= region;
+

        if (res.empty())
                return;
        
        if (res.empty())
                return;
        


@@ -66,7 +113,7 @@ void eWidget::show()
                abspos += root->position();
        }
 
                abspos += root->position();
        }
 

-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);

 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);


@@ -75,7 +122,17 @@ void eWidget::show()
 
 void eWidget::hide()
 {
 
 void eWidget::hide()
 {

+               /* TODO: when hiding an upper level widget, widgets get hidden but keep the */
+               /* wVisShow flag (because when the widget is shown again, the widgets must */
+               /* become visible again. */
+       if (!(m_vis & wVisShow))
+               return;

        m_vis &= ~wVisShow;
        m_vis &= ~wVisShow;

+       
+               /* this is a workaround to the above problem. when we are in the delete phase, 
+                  don't hide childs. */
+       if (!(m_parent || m_desktop))
+               return;

 
                /* TODO: optimize here to only recalc what's required. possibly merge with show. */
        eWidget *root = this;
 
                /* TODO: optimize here to only recalc what's required. possibly merge with show. */
        eWidget *root = this;


@@ -83,6 +140,8 @@ void eWidget::hide()
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
        while (root && !root->m_desktop)
        {
                root = root->m_parent;

+               if (!root)
+                       return;

                abspos += root->position();
        }
        assert(root->m_desktop);
                abspos += root->position();
        }
        assert(root->m_desktop);


@@ -90,7 +149,7 @@ void eWidget::hide()
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 

-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);

        root->m_desktop->invalidate(abs);
 }
 
        root->m_desktop->invalidate(abs);
 }
 


@@ -101,52 +160,154 @@ void eWidget::destruct()
        delete this;
 }
 
        delete this;
 }
 

+void eWidget::setBackgroundColor(const gRGB &col)
+{
+       m_background_color = col;
+       m_have_background_color = 1;
+}
+
+void eWidget::clearBackgroundColor()
+{
+       m_have_background_color = 0;
+}
+
+void eWidget::setZPosition(int z)
+{
+       m_z_position = z;
+       if (!m_parent)
+               return;
+       
+       m_parent->m_childs.remove(this);
+       
+       insertIntoParent(); /* now at the new Z position */
+}
+
+void eWidget::setTransparent(int transp)
+{
+       if (transp)
+               m_vis |= wVisTransparent;
+       else
+               m_vis &=~wVisTransparent;
+}
+
+void eWidget::mayKillFocus()
+{
+       setFocus(0);
+               /* when we have the focus, remove it first. */
+       if (m_focus_owner)
+               m_focus_owner->setFocus(0);
+}
+

 eWidget::~eWidget()
 {
 eWidget::~eWidget()
 {

-               /* destroy all childs */
+       hide();
+       
+       if (m_parent)
+               m_parent->m_childs.remove(this);
+
+       m_parent = 0;
+
+               /* tell all childs that the parent is not anymore existing */

        ePtrList<eWidget>::iterator i(m_childs.begin());
        while (i != m_childs.end())
        {
        ePtrList<eWidget>::iterator i(m_childs.begin());
        while (i != m_childs.end())
        {

-               delete *i;
+               (*i)->parentRemoved();

                i = m_childs.erase(i);
        }
 }
 
                i = m_childs.erase(i);
        }
 }
 

+void eWidget::insertIntoParent()
+{
+       ePtrList<eWidget>::iterator i = m_parent->m_childs.begin();
+       
+       for(;;)
+       {
+               if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position))
+               {
+                       m_parent->m_childs.insert(i, this);
+                       return;
+               }
+               ++i;
+       }
+}
+

 void eWidget::doPaint(gPainter &painter, const gRegion &r)
 {
        if (m_visible_with_childs.empty())
                return;
        
 void eWidget::doPaint(gPainter &painter, const gRegion &r)
 {
        if (m_visible_with_childs.empty())
                return;
        

-       gRegion region = r;
+       gRegion region = r, childs = r;

                        /* we were in parent's space, now we are in local space */
        region.moveBy(-position());
        
        painter.moveOffset(position());
                        /* we were in parent's space, now we are in local space */
        region.moveBy(-position());
        
        painter.moveOffset(position());

-               /* walk all childs */
-       for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
-               i->doPaint(painter, region);

        
                /* check if there's anything for us to paint */
        region &= m_visible_region;
        
        
                /* check if there's anything for us to paint */
        region &= m_visible_region;
        

-       painter.resetClip(region);
-       event(evtPaint, &region, &painter);
+       if (!region.empty())
+       {
+               painter.resetClip(region);
+               event(evtPaint, &region, &painter);
+       }
+
+       childs.moveBy(-position());
+               /* walk all childs */
+       for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+               i->doPaint(painter, childs);

        
        painter.moveOffset(-position());
 }
 
        
        painter.moveOffset(-position());
 }
 

+void eWidget::recalcClipRegionsWhenVisible()
+{
+       eWidget *t = this;
+       do
+       {
+               if (!(t->m_vis & wVisShow))
+                       break;
+               if (t->m_desktop)
+               {
+                       t->m_desktop->recalcClipRegions(t);
+                       break;
+               }
+               t = t->m_parent;
+               assert(t);
+       } while(1);
+}
+
+void eWidget::parentRemoved()
+{
+       m_parent = 0;
+}
+

 int eWidget::event(int event, void *data, void *data2)
 {
        switch (event)
        {
        case evtPaint:
        {
 int eWidget::event(int event, void *data, void *data2)
 {
        switch (event)
        {
        case evtPaint:
        {

-               static int counter = 0x18;

                gPainter &painter = *(gPainter*)data2;
                gPainter &painter = *(gPainter*)data2;

-//             eDebug("eWidget::evtPaint %d", counter);
+               
+//             eDebug("eWidget::evtPaint");

 //             dumpRegion(*(gRegion*)data);
 //             dumpRegion(*(gRegion*)data);

-               painter.setBackgroundColor(gColor(++counter));
-               painter.clear();
+               if (!isTransparent())
+               {
+                       if (!m_have_background_color)
+                       {
+                               ePtr<eWindowStyle> style;
+                               if (!getStyle(style))
+                                       style->paintBackground(painter, ePoint(0, 0), size());
+                       } else
+                       {
+                               painter.setBackgroundColor(m_background_color);
+                               painter.clear();
+                       }
+               } else
+               {
+                       if (m_have_background_color)
+                               painter.setBackgroundColor(m_background_color);
+               }

                break;
        }
        case evtKey:
                break;
        }
        case evtKey:


@@ -159,9 +320,26 @@ int eWidget::event(int event, void *data, void *data2)
                m_clip_region = gRegion(eRect(ePoint(0, 0),  m_size));
                break;
        }
                m_clip_region = gRegion(eRect(ePoint(0, 0),  m_size));
                break;
        }

+       case evtFocusGot:
+               m_focus_owner = (eWidget*)data;
+               break;
+       case evtFocusLost:
+               m_focus_owner = 0;
+               break;

        default:
                return -1;
        }
        return 0;
 }
 
        default:
                return -1;
        }
        return 0;
 }
 

+void eWidget::setFocus(eWidget *focus)
+{
+       if (m_current_focus)
+               m_current_focus->event(evtFocusLost, this);
+       
+       m_current_focus = focus;
+
+       if (m_current_focus)
+               m_current_focus->event(evtFocusGot, this);
+}
+