[Gnash-commit] gnash ChangeLog server/movie_root.cpp testsuite...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/16 16:59:43

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

Log message:
        * server/movie_root.cpp (generate_mouse_button_events): don't let
          handling of mouse DOWN-to-UP transition handling change the
          status and thus trigger further processing of UP-MOVING pointer.
        * testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp: fix expected
          results + successes (we won't send RollOut after ReleaseOutside
          now).
        * testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp:
          successes (we won't send RollOut after ReleaseOutside now).
        
        Games tests highly welcome, as this is touching mouse events processing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6300&r2=1.6301
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6300
retrieving revision 1.6301
diff -u -b -r1.6300 -r1.6301
--- ChangeLog   16 Apr 2008 15:59:45 -0000      1.6300
+++ ChangeLog   16 Apr 2008 16:59:42 -0000      1.6301
@@ -1,3 +1,14 @@
+2008-04-16 Sandro Santilli <address@hidden>
+
+       * server/movie_root.cpp (generate_mouse_button_events): don't let
+         handling of mouse DOWN-to-UP transition handling change the
+         status and thus trigger further processing of UP-MOVING pointer.
+       * testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp: fix expected
+         results + successes (we won't send RollOut after ReleaseOutside
+         now).
+       * testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp:
+         successes (we won't send RollOut after ReleaseOutside now).
+
 2008-04-16 Benjamin Wolsey <address@hidden>
 
        * testsuite/swfdec/PASSING: some newly added swfdec tests

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- server/movie_root.cpp       11 Apr 2008 15:33:45 -0000      1.175
+++ server/movie_root.cpp       16 Apr 2008 16:59:43 -0000      1.176
@@ -713,6 +713,11 @@
 
                                        // onReleaseOutside
                                        
active_entity->on_button_event(event_id::RELEASE_OUTSIDE);
+
+                                       // We got out of active entity
+                                       //ms->m_mouse_inside_entity_last = 
false;
+                                       active_entity = NULL; // so we don't 
get RollOut next...
+
                                        // TODO: have on_button_event return
                                        //       wheter the action must trigger
                                        //       a redraw.
@@ -721,8 +726,7 @@
                        }
                }
        }
-
-       if ( ms->m_mouse_button_state_last == mouse_button_state::UP )
+       else if ( ms->m_mouse_button_state_last == mouse_button_state::UP )
        {
                // Mouse button was up.
 

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 16 Apr 2008 08:35:39 
-0000      1.25
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 16 Apr 2008 16:59:43 
-0000      1.26
@@ -68,8 +68,8 @@
                        check_pixel(72, 64, 2, dark_yellow, 2); 
                }
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
                check(!tester.isMouseOverMouseEntity());
                if ( covered )
                {
@@ -97,8 +97,8 @@
                // check that pixel @ 60,60 is green !
                check_pixel(60, 60, 2, green, 2);
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
                check(!tester.isMouseOverMouseEntity());
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2);  }
@@ -116,8 +116,8 @@
                if ( covered ) { check_pixel(60, 60, 2, covered_yellow, 2);  }
                else { check_pixel(60, 60, 2, yellow, 2);  }
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
                check(!tester.isMouseOverMouseEntity());
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2);  }
@@ -127,8 +127,13 @@
        // roll off the square, this should change
        // the textfield value, if enabled
        tester.movePointerTo(39, 60);
+       if ( enabled ) {
        check_equals(string(text->get_text_value()), string("MouseOut"));
        check_equals(string(text2->get_text_value()), string("RollOut"));
+       } else {
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
+       }
        check(!tester.isMouseOverMouseEntity());
        // check that pixel @ 60,60 is red !
        if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
@@ -137,8 +142,13 @@
        // press the mouse button, this should not change anything
        // as we're outside of the button.
        tester.pressMouseButton();
+       if ( enabled ) {
        check_equals(string(text->get_text_value()), string("MouseOut"));
        check_equals(string(text2->get_text_value()), string("RollOut"));
+       } else {
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
+       }
        check(!tester.isMouseOverMouseEntity());
        // check that pixel @ 60,60 is red !
        if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
@@ -147,8 +157,13 @@
        // depress the mouse button, this should not change anything
        // as we're outside of the button.
        tester.depressMouseButton();
+       if ( enabled ) {
        check_equals(string(text->get_text_value()), string("MouseOut"));
        check_equals(string(text2->get_text_value()), string("RollOut"));
+       } else {
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
+       }
        check(!tester.isMouseOverMouseEntity());
        // check that pixel @ 60,60 is red !
        if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
@@ -166,8 +181,8 @@
                if ( covered ) { check_pixel(60, 60, 2, covered_yellow, 2);  }
                else { check_pixel(60, 60, 2, yellow, 2);  }
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
                check(!tester.isMouseOverMouseEntity());
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
@@ -183,8 +198,8 @@
                // check that pixel @ 60,60 is green !
                check_pixel(60, 60, 2, rgba(0,255,0,255), 2);
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
                check(!tester.isMouseOverMouseEntity());
                // check that pixel @ 60,60 is red !
                if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
@@ -198,11 +213,11 @@
        tester.depressMouseButton();
 
        if ( enabled ) {
-               xcheck_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
-               xcheck_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
        } else {
-               check_equals(string(text->get_text_value()), 
string("MouseOut"));
-               check_equals(string(text2->get_text_value()), 
string("RollOut"));
+               check_equals(string(text->get_text_value()), 
string("MouseUpOutside"));
+               check_equals(string(text2->get_text_value()), 
string("ReleaseOutside"));
        }
 }
 

Index: testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp   16 Apr 2008 
15:02:22 -0000      1.7
+++ testsuite/misc-ming.all/SpriteButtonEventsTest-Runner.cpp   16 Apr 2008 
16:59:43 -0000      1.8
@@ -187,10 +187,10 @@
        tester.depressMouseButton();
 
        if ( enabled ) {
-               xcheck_equals(string(text->get_text_value()), 
string("ReleaseOutside")); // Gnash doesn't send this event !
+               check_equals(string(text->get_text_value()), 
string("ReleaseOutside")); 
                check_equals(string(text2->get_text_value()), "MouseUp");
        } else {
-               xcheck_equals(string(text->get_text_value()), 
string("ReleaseOutside")); // Gnash doesn't send this event !
+               check_equals(string(text->get_text_value()), 
string("ReleaseOutside"));
                check_equals(string(text2->get_text_value()), "MouseUp");
        }
 }