[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Stag...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/29 14:47:28

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Stage.as 
        server         : movie_root.cpp namedStrings.cpp namedStrings.h 
        server/asobj   : Stage.cpp Stage.h 

Log message:
                * server/namedStrings.{cpp,h}: add onFullScreen.
                * server/asobj/Stage.{h,cpp}: drop own onResize member, add
                  notifyFullScreen.
                * server/movie_root.cpp: notify onFullScreen listener on
                  state change.
                * testsuite/actionscript.all/Stage.as: make number of tests
                  independent of correctness. Some passes, but I've lost track
                  a bit of the onResize test - would be grateful if someone
                  can test with pp (Linux version supposedly broken in this
                  regard).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6445&r2=1.6446
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Stage.as?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.189&r2=1.190
http://cvs.savannah.gnu.org/viewcvs/gnash/server/namedStrings.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/namedStrings.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6445
retrieving revision 1.6446
diff -u -b -r1.6445 -r1.6446
--- ChangeLog   29 Apr 2008 14:11:54 -0000      1.6445
+++ ChangeLog   29 Apr 2008 14:47:24 -0000      1.6446
@@ -1,5 +1,18 @@
 2008-04-29 Benjamin Wolsey <address@hidden>
 
+       * server/namedStrings.{cpp,h}: add onFullScreen.
+       * server/asobj/Stage.{h,cpp}: drop own onResize member, add
+         notifyFullScreen.
+       * server/movie_root.cpp: notify onFullScreen listener on
+         state change.
+       * testsuite/actionscript.all/Stage.as: make number of tests
+         independent of correctness. Some passes, but I've lost track
+         a bit of the onResize test - would be grateful if someone
+         can test with pp (Linux version supposedly broken in this
+         regard).
+
+2008-04-29 Benjamin Wolsey <address@hidden>
+
        * testsuite/actionscript.all/Stage.as: test onFullScreen().
 
 2008-04-29 Benjamin Wolsey <address@hidden>

Index: testsuite/actionscript.all/Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/actionscript.all/Stage.as 29 Apr 2008 14:11:56 -0000      1.31
+++ testsuite/actionscript.all/Stage.as 29 Apr 2008 14:47:26 -0000      1.32
@@ -21,7 +21,7 @@
 // execute it like this gnash -1 -r 0 -v out.swf
 
 
-rcsid="$Id: Stage.as,v 1.31 2008/04/29 14:11:56 bwy Exp $";
+rcsid="$Id: Stage.as,v 1.32 2008/04/29 14:47:26 bwy Exp $";
 #include "check.as"
 
 check_equals (typeof(Stage), 'object');
@@ -112,11 +112,15 @@
 
 #if OUTPUT_VERSION > 5
 
+stageheightcheck = 0;
+rscount = 0;
+
 listener = new Object;
 listener.onResize = function() {
        _root.note("Resize event received, args to handler: 
"+arguments.length+" Stage.width="+Stage.width+", Stage.height="+Stage.height);
        Stage.height = 1;
-       check(Stage.height != 1);
+       stageheightcheck = Stage.height;
+       rscount++;
        // If we delete the Stage object, events won't arrive anymore, but
        // the precedent setting of 'scaleMode' will persist !!
        //delete Stage;
@@ -151,8 +155,22 @@
 
 Stage.displayState = "fullScreen";
 Stage.displayState = "normal";
-xcheck_equals (fscount, 2);
-xcheck_equals (valtype, "boolean");
+
+// number of calls to Stage.onFullScreen()
+check_equals (fscount, 2);
+
+// number of calls to Stage.onResize()
+// NOTE: proprietary player for linux is bogus here,
+//       in that it always sends an onResize event
+//       when scaleMode is set to "noScale" from something else
+note("NOTE: Linux version of the proprietary player is known to fail a test 
(sending a bogus onResize event)");
+check_equals (rscount, 0);
+
+// Type of onFullScreen argument
+check_equals (valtype, "boolean");
+
+// Try to set in onResize (but it should be read only).
+check(stageheightcheck != 1);
 
 o = new Object();
 o.onResize = function() {
@@ -170,11 +188,7 @@
 
 
 #if OUTPUT_VERSION > 5
- // NOTE: proprietary player for linux is bogus here,
- //       in that it always sends an onResize event
- //       when scaleMode is set to "noScale" from something else
- note("NOTE: Linux version of the proprieraty player is known to fail a test 
(sending a bogus onResize event)");
- check_totals(49);
+ check_totals(51);
 #else
  check_totals(32);
 #endif

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- server/movie_root.cpp       29 Apr 2008 08:53:36 -0000      1.189
+++ server/movie_root.cpp       29 Apr 2008 14:47:27 -0000      1.190
@@ -1390,6 +1390,9 @@
 {
     _displayState = ds;
 
+    boost::intrusive_ptr<Stage> stage = getStageObject();
+    if ( stage ) stage->notifyFullScreen( (_displayState == fullScreen) );
+
        if (!movie_root::interfaceHandle) return; // No registered callback
        
        if (_displayState == fullScreen)

Index: server/namedStrings.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/namedStrings.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/namedStrings.cpp     27 Apr 2008 15:39:39 -0000      1.15
+++ server/namedStrings.cpp     29 Apr 2008 14:47:27 -0000      1.16
@@ -71,6 +71,7 @@
        string_table::svt( "onInitialize", NSV::PROP_ON_INITIALIZE ),
        string_table::svt( "onData", NSV::PROP_ON_DATA ),
        string_table::svt( "onResize", NSV::PROP_ON_RESIZE ),
+       string_table::svt( "onFullScreen", NSV::PROP_ON_FULLSCREEN ),
        string_table::svt( "onPress", NSV::PROP_ON_PRESS ),
        string_table::svt( "onRelease", NSV::PROP_ON_RELEASE ),
        string_table::svt( "onReleaseOutside", NSV::PROP_ON_RELEASE_OUTSIDE ),

Index: server/namedStrings.h
===================================================================
RCS file: /sources/gnash/gnash/server/namedStrings.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/namedStrings.h       27 Apr 2008 15:39:39 -0000      1.15
+++ server/namedStrings.h       29 Apr 2008 14:47:27 -0000      1.16
@@ -89,6 +89,7 @@
                PROP_ON_INITIALIZE,
                PROP_ON_DATA,
                PROP_ON_RESIZE,
+               PROP_ON_FULLSCREEN,
                PROP_ON_PRESS,
                PROP_ON_RELEASE,
                PROP_ON_RELEASE_OUTSIDE,

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/Stage.cpp      29 Apr 2008 08:53:36 -0000      1.45
+++ server/asobj/Stage.cpp      29 Apr 2008 14:47:27 -0000      1.46
@@ -114,13 +114,12 @@
 
 
 void
-Stage::onResize()
+Stage::notifyFullScreen(bool fs)
 {
-       as_value v;
-       if (get_member(NSV::PROP_SCALE_MODE, &v) && v.to_string() == "noScale" )
-       {
-               notifyResize();
-       }
+    // Should we notify resize here, or does movie_root do it anyway
+    // when the gui changes size?
+       log_debug("notifying Stage listeners about fullscreen state");
+       callMethod(NSV::PROP_BROADCAST_MESSAGE, "onFullScreen", fs);
 }
 
 

Index: server/asobj/Stage.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/Stage.h        29 Apr 2008 08:53:36 -0000      1.22
+++ server/asobj/Stage.h        29 Apr 2008 14:47:28 -0000      1.23
@@ -50,12 +50,11 @@
     
        Stage();
        
-       /// Receive a resize event.
-       void onResize();
-
        /// Notify all listeners about a resize event
        void notifyResize();
 
+       void notifyFullScreen(bool fs);
+
 };
 
 /// Register native functions with the VM.