[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/19 20:28:35

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 

Log message:
                * server/vm/ASHandlers.cpp (CommonGetUrl): check for _level#
                  loading even when loadTargetFlag is clear.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4039&r2=1.4040
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4039
retrieving revision 1.4040
diff -u -b -r1.4039 -r1.4040
--- ChangeLog   19 Aug 2007 20:22:43 -0000      1.4039
+++ ChangeLog   19 Aug 2007 20:28:35 -0000      1.4040
@@ -1,5 +1,7 @@
 2007-08-19 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (CommonGetUrl): check for _level#
+         loading even when loadTargetFlag is clear.
        * server/FreetypeGlyphsProvider.cpp: remove compiler warnings.
        * doc/C/usermanual/usage/gnashrc.xml: document
          flashVersionString variable.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/vm/ASHandlers.cpp    18 Aug 2007 17:47:31 -0000      1.120
+++ server/vm/ASHandlers.cpp    19 Aug 2007 20:28:35 -0000      1.121
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.120 2007/08/18 17:47:31 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.121 2007/08/19 20:28:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1731,6 +1731,9 @@
 //   NOTE: this is affected by the GetUrl bug reported with an excerpt
 //         from Colin Moock book, see below. (won't work, and won't fix)
 //
+// - http://www.uptoten.com
+//   Should load in _level0, with loadTargetFlag set.
+//
 void
 SWFHandlers::CommonGetUrl(as_environment& env,
                as_value target, // the target window, or _level1..10
@@ -1897,6 +1900,14 @@
                        sendVarsMethod);
        }
 
+       if ( target_string.compare(0, 6, "_level") == 0 && 
target_string.find_first_not_of("0123456789", 7) == string::npos )
+       {
+               unsigned int levelno = atoi(target_string.c_str()+6);
+               log_debug(_("Testing _level loading (level %u)"), levelno);
+               VM::get().getRoot().loadLevel(levelno, url);
+               return;
+       }
+
 #ifndef __OS2__x
        string command = "firefox -remote \"openurl(";
 #else // def __OS2__x