[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/24 13:50:53

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (get_topmost_mouse_entity): don't
                  segfault if the root movie can handle mouse events :/

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4685&r2=1.4686
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.370&r2=1.371

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4685
retrieving revision 1.4686
diff -u -b -r1.4685 -r1.4686
--- ChangeLog   24 Oct 2007 13:16:26 -0000      1.4685
+++ ChangeLog   24 Oct 2007 13:50:53 -0000      1.4686
@@ -1,3 +1,8 @@
+2007-10-24 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (get_topmost_mouse_entity): don't
+         segfault if the root movie can handle mouse events :/
+
 2007-10-24 Udo Giacomozzi <address@hidden>
 
        * libgeometry/snappingrange.h: add routines for calculating

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -b -r1.370 -r1.371
--- server/sprite_instance.cpp  18 Oct 2007 11:47:55 -0000      1.370
+++ server/sprite_instance.cpp  24 Oct 2007 13:50:53 -0000      1.371
@@ -3037,7 +3037,14 @@
        {
                // point is in parent's space,
                // we need to convert it in world space
-               matrix parent_world_matrix = get_parent()->get_world_matrix();
+               character* parent = get_parent();
+               // WARNING: if we have NO parent, our parent it the Stage 
(movie_root)
+               //          so, in case we'll add a "stage" matrix, we'll need 
to take
+               //          it into account here.
+               // TODO: actually, why are we insisting in using parent's 
coordinates for
+               //       this method at all ?
+               //
+               matrix parent_world_matrix = parent ? 
parent->get_world_matrix() : matrix::identity;
                point wp(x,y);
                parent_world_matrix.transform(wp);
                if ( pointInVisibleShape(wp.m_x, wp.m_y) ) return this;