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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/16 19:53:46

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-ming.all: SpriteButtonEventsTest-Runner.cpp 

Log message:
                * server/sprite_instance.cpp (can_handle_mouse_event):
                  A MovieClip can't handle mouse event if it's not enabled.
                  If no 'enabled' member is found, sprite is considered
                  enabled.
                * testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp:
                  success in "active" entity state based on .enabled member.
        
        Still in the world of interaction messup. No failures in our testsuite,
        but we're not being very disciplined in interaction tests, so other
        manual tests are still welcome.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6302&r2=1.6303
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.503&r2=1.504
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6302
retrieving revision 1.6303
diff -u -b -r1.6302 -r1.6303
--- ChangeLog   16 Apr 2008 19:16:56 -0000      1.6302
+++ ChangeLog   16 Apr 2008 19:53:44 -0000      1.6303
@@ -1,3 +1,12 @@
+2008-04-16 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (can_handle_mouse_event):
+         A MovieClip can't handle mouse event if it's not enabled.
+         If no 'enabled' member is found, sprite is considered
+         enabled.
+       * testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp:
+         success in "active" entity state based on .enabled member.
+
 2008-04-16 Benjamin Wolsey <address@hidden>
 
        * server/character.cpp: x and y translation should be

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -b -r1.503 -r1.504
--- server/sprite_instance.cpp  15 Apr 2008 11:27:19 -0000      1.503
+++ server/sprite_instance.cpp  16 Apr 2008 19:53:45 -0000      1.504
@@ -3778,6 +3778,8 @@
 bool
 sprite_instance::can_handle_mouse_event() const
 {
+  if ( ! isEnabled() ) return false;
+
   // Event handlers that qualify as mouse event handlers.
   static const event_id EH[] =
   {
@@ -4426,7 +4428,11 @@
   as_value enabled;
   // const_cast needed due to get_member being non-const due to the 
   // possibility that a getter-setter would actually modify us ...
-  const_cast<sprite_instance*>(this)->get_member(NSV::PROP_ENABLED, &enabled);
+  if ( ! const_cast<sprite_instance*>(this)->get_member(NSV::PROP_ENABLED, 
&enabled) )
+  {
+     // We're enabled if there's no 'enabled' member...
+     return true;
+  }
   return enabled.to_bool();
 }
 

Index: testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp   16 Apr 2008 
16:59:43 -0000      1.8
+++ testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp   16 Apr 2008 
19:53:45 -0000      1.9
@@ -59,7 +59,7 @@
        } else {
                check_equals(string(text->get_text_value()), tmp); // not 
enabled...
                check_equals(string(text2->get_text_value()), tmp2); // would 
retain last value
-               xcheck(!tester.isMouseOverMouseEntity()); // gnash still 
considers it active
+               check(!tester.isMouseOverMouseEntity());
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2);  }
                else { check_pixel(60, 60, 2, red, 2);  }
@@ -77,7 +77,7 @@
        } else {
                check_equals(string(text->get_text_value()), tmp); 
                check_equals(string(text2->get_text_value()), 
string("MouseDown")); // no matter .enabled
-               xcheck(!tester.isMouseOverMouseEntity()); // Gnash should check 
.enabled
+               check(!tester.isMouseOverMouseEntity()); 
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2);  }
                else { check_pixel(60, 60, 2, red, 2);  }
@@ -96,7 +96,7 @@
        } else {
                check_equals(string(text->get_text_value()), tmp);
                check_equals(string(text2->get_text_value()), 
string("MouseUp")); // no matter .enabled
-               xcheck(!tester.isMouseOverMouseEntity()); // Gnash should check 
.enabled
+               check(!tester.isMouseOverMouseEntity()); 
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2);  }
                else { check_pixel(60, 60, 2, red, 2);  }
@@ -157,7 +157,7 @@
        } else {
                check_equals(string(text->get_text_value()), tmp);
                check_equals(string(text2->get_text_value()), tmp2);
-               xcheck(!tester.isMouseOverMouseEntity()); // Gnash should check 
.enabled
+               check(!tester.isMouseOverMouseEntity()); 
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
                else { check_pixel(60, 60, 2, red, 2); }
@@ -174,7 +174,7 @@
        } else {
                check_equals(string(text->get_text_value()), tmp);
                check_equals(string(text2->get_text_value()), 
string("MouseDown"));
-               xcheck(!tester.isMouseOverMouseEntity()); // Gnash should check 
.enabled
+               check(!tester.isMouseOverMouseEntity()); 
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
                else { check_pixel(60, 60, 2, red, 2); }